aboutsummaryrefslogtreecommitdiff
path: root/builtin/diff.c
Commit message (Expand)AuthorAge
* Merge branch 'bw/config-h'Junio C Hamano2017-06-24
|\
| * config: don't include config.h by defaultBrandon Williams2017-06-15
* | Merge branch 'bw/object-id'Junio C Hamano2017-06-19
|\ \
| * | diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams2017-06-05
| * | combine-diff: convert diff_tree_combined to struct object_idBrandon Williams2017-06-02
| * | diff: convert fill_filespec to struct object_idBrandon Williams2017-06-02
* | | Merge branch 'jk/diff-blob'Junio C Hamano2017-06-02
|\ \ \ | |/ / |/| |
| * | diff: use blob path for blob/file diffsJeff King2017-05-24
| * | diff: use pending "path" if it is availableJeff King2017-05-24
| * | diff: use the word "path" instead of "name" for blobsJeff King2017-05-24
| * | diff: pass whole pending entry in blobinfoJeff King2017-05-24
| |/
* | object: convert parse_object* to take struct object_idbrian m. carlson2017-05-08
* | Convert lookup_tree to struct object_idbrian m. carlson2017-05-08
* | Clean up outstanding object_id transforms.brian m. carlson2017-05-02
|/
* Rename sha1_array to oid_arraybrian m. carlson2017-03-31
* Make sha1_array_append take a struct object_id *brian m. carlson2017-03-31
* builtin/diff: convert to struct object_idbrian m. carlson2017-03-26
* use SWAP macroRené Scharfe2017-01-30
* Merge branch 'jk/setup-sequence-update'Junio C Hamano2016-09-21
|\
| * diff: always try to set up the repositoryJeff King2016-09-13
| * diff: skip implicit no-index check when given --no-indexJeff King2016-09-13
| * Merge branch 'ar/diff-args-osx-precompose' into maintJunio C Hamano2016-06-06
| |\
* | \ Merge branch 'ar/diff-args-osx-precompose'Junio C Hamano2016-05-23
|\ \ \ | | |/ | |/|
| * | diff: run arguments through precompose_argvAlexander Rinass2016-05-13
* | | diff: activate diff.renames by defaultMatthieu Moy2016-02-25
| |/ |/|
* | Merge branch 'nd/diff-with-path-params'Junio C Hamano2016-02-03
|\ \
| * | diff-no-index: do not take a redundant prefix argumentNguyễn Thái Ngọc Duy2016-01-21
| |/
* | Remove get_object_hash.brian m. carlson2015-11-20
* | Add several uses of get_object_hash.brian m. carlson2015-11-20
|/
* lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty2014-10-01
* Merge branch 'tg/diff-no-index-refactor'Junio C Hamano2013-12-27
|\
| * diff: avoid some nestingThomas Gummerer2013-12-16
| * diff: don't read index when --no-index is givenThomas Gummerer2013-12-12
| * diff: move no-index detection to builtin/diff.cThomas Gummerer2013-12-12
* | Merge branch 'nd/magic-pathspec'Junio C Hamano2013-12-06
|\ \ | |/ |/|
| * diff: restrict pathspec limitations to diff b/f case onlyNguyễn Thái Ngọc Duy2013-11-20
* | diff: trivial style fixFelipe Contreras2013-10-31
|/
* pathspec: support :(literal) syntax for noglob pathspecNguyễn Thái Ngọc Duy2013-07-15
* convert read_cache_preload() to take struct pathspecNguyễn Thái Ngọc Duy2013-07-15
* guard against new pathspec magic in pathspec matching codeNguyễn Thái Ngọc Duy2013-07-15
* cmd_diff(): make it obvious which cases are exclusive of each otherMichael Haggerty2013-05-28
* cmd_diff(): rename local variable "list" -> "entry"Michael Haggerty2013-05-28
* cmd_diff(): use an object_array for holding treesMichael Haggerty2013-05-28
* builtin_diff_tree(): make it obvious that function wants two entriesMichael Haggerty2013-05-28
* Merge branch 'kb/preload-index-more'Junio C Hamano2012-11-20
|\
| * update-index/diff-index: use core.preloadindex to improve performanceKarsten Blees2012-11-02
| * Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano2012-09-11
| |\
| * \ Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano2012-09-10
| |\ \
* | | | Move setup_diff_pager to libgit.aNguyễn Thái Ngọc Duy2012-10-29
* | | | Merge branch 'jk/maint-null-in-trees'Junio C Hamano2012-08-27
|\ \ \ \ | | |/ / | |/| |