| Commit message (Expand) | Author | Age | Files | Lines |
* | diff: introduce DIFF_PICKAXE_KINDS_MASK | Stefan Beller | 2018-01-04 | 1 | -1/+1 |
* | Merge branch 'bw/diff-opt-impl-to-bitfields' | Junio C Hamano | 2017-11-09 | 1 | -5/+5 |
|\ |
|
| * | diff: make struct diff_flags members lowercasebw/diff-opt-impl-to-bitfields | Brandon Williams | 2017-11-01 | 1 | -5/+5 |
| * | diff: remove DIFF_OPT_CLR macro | Brandon Williams | 2017-11-01 | 1 | -1/+1 |
| * | diff: remove DIFF_OPT_SET macro | Brandon Williams | 2017-11-01 | 1 | -1/+1 |
| * | diff: remove DIFF_OPT_TST macro | Brandon Williams | 2017-11-01 | 1 | -3/+3 |
* | | refs: convert resolve_gitlink_ref to struct object_id | brian m. carlson | 2017-10-16 | 1 | -1/+1 |
|/ |
|
* | Merge branch 'bw/ls-files-sans-the-index' | Junio C Hamano | 2017-06-24 | 1 | -1/+1 |
|\ |
|
| * | convert: convert convert_to_git to take an index | Brandon Williams | 2017-06-13 | 1 | -1/+1 |
* | | tree-diff: convert diff_tree_paths to struct object_id | Brandon Williams | 2017-06-05 | 1 | -5/+5 |
* | | diff-tree: convert diff_tree_sha1 to struct object_id | Brandon Williams | 2017-06-05 | 1 | -2/+2 |
* | | combine-diff: convert find_paths_* to struct object_id | Brandon Williams | 2017-06-02 | 1 | -6/+6 |
* | | combine-diff: convert diff_tree_combined to struct object_id | Brandon Williams | 2017-06-02 | 1 | -5/+5 |
* | | diff: convert fill_filespec to struct object_id | Brandon Williams | 2017-06-02 | 1 | -2/+2 |
|/ |
|
* | Merge branch 'bc/object-id' | Junio C Hamano | 2017-04-19 | 1 | -9/+9 |
|\ |
|
| * | Rename sha1_array to oid_array | brian m. carlson | 2017-03-31 | 1 | -6/+6 |
| * | Make sha1_array_append take a struct object_id * | brian m. carlson | 2017-03-31 | 1 | -1/+1 |
| * | sha1-array: convert internal storage for struct sha1_array to object_id | brian m. carlson | 2017-03-28 | 1 | -3/+3 |
* | | combine-diff: replace malloc/snprintf with xstrfmt | Jeff King | 2017-03-30 | 1 | -3/+4 |
|/ |
|
* | diff_aligned_abbrev: use "struct oid" | Jeff King | 2016-10-26 | 1 | -2/+2 |
* | diff_unique_abbrev: rename to diff_aligned_abbrev | Jeff King | 2016-10-26 | 1 | -3/+3 |
* | Merge branch 'bc/cocci' | Junio C Hamano | 2016-07-19 | 1 | -7/+7 |
|\ |
|
| * | diff: rename struct diff_filespec's sha1_valid member | brian m. carlson | 2016-06-28 | 1 | -2/+2 |
| * | diff: convert struct diff_filespec to struct object_id | brian m. carlson | 2016-06-28 | 1 | -5/+5 |
* | | pathspec: rename free_pathspec() to clear_pathspec()jc/clear-pathspec | Junio C Hamano | 2016-06-02 | 1 | -1/+1 |
|/ |
|
* | combine-diff.c: use error_errno() | Nguyễn Thái Ngọc Duy | 2016-05-09 | 1 | -2/+1 |
* | use st_add and st_mult for allocation size computation | Jeff King | 2016-02-22 | 1 | -7/+7 |
* | convert trivial cases to FLEX_ARRAY macros | Jeff King | 2016-02-22 | 1 | -3/+1 |
* | use xmallocz to avoid size arithmetic | Jeff King | 2016-02-22 | 1 | -3/+1 |
* | convert trivial cases to ALLOC_ARRAY | Jeff King | 2016-02-22 | 1 | -2/+2 |
* | Remove get_object_hash. | brian m. carlson | 2015-11-20 | 1 | -2/+2 |
* | Add several uses of get_object_hash. | brian m. carlson | 2015-11-20 | 1 | -2/+2 |
* | Sync with 2.4.10 | Junio C Hamano | 2015-09-28 | 1 | -2/+4 |
|\ |
|
| * | Sync with 2.3.10 | Junio C Hamano | 2015-09-28 | 1 | -2/+4 |
| |\ |
|
| | * | react to errors in xdi_diff | Jeff King | 2015-09-28 | 1 | -2/+4 |
* | | | Merge branch 'jk/color-diff-plain-is-context' | Junio C Hamano | 2015-06-11 | 1 | -3/+3 |
|\ \ \
| |/ / |
|
| * | | diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTjk/color-diff-plain-is-context | Jeff King | 2015-05-27 | 1 | -3/+3 |
| |/ |
|
* | | diff: convert struct combine_diff_path to object_id | brian m. carlson | 2015-03-13 | 1 | -28/+28 |
|/ |
|
* | Merge branch 'jk/pretty-empty-format' | Junio C Hamano | 2014-09-02 | 1 | -1/+2 |
|\ |
|
| * | pretty: make empty userformats truly emptyjk/pretty-empty-format | Jeff King | 2014-07-30 | 1 | -1/+2 |
* | | Merge branch 'jk/diff-tree-t-fix' | Junio C Hamano | 2014-08-26 | 1 | -1/+11 |
|\ \
| |/
|/| |
|
| * | intersect_paths: respect mode in git's tree-sortjk/diff-tree-t-fix | Jeff King | 2014-08-20 | 1 | -1/+11 |
* | | Merge branch 'mk/show-s-no-extra-blank-line-for-merges' | Junio C Hamano | 2014-06-06 | 1 | -1/+2 |
|\ \ |
|
| * | | git-show: fix 'git show -s' to not add extra terminator after merge commitmk/show-s-no-extra-blank-line-for-merges | Max Kirillov | 2014-05-15 | 1 | -1/+2 |
* | | | combine-diff: speed it up, by using multiparent diff tree-walker directly | Kirill Smelkov | 2014-04-07 | 1 | -5/+83 |
* | | | combine-diff: move changed-paths scanning logic into its own function | Kirill Smelkov | 2014-02-24 | 1 | -27/+53 |
* | | | combine-diff: move show_log_first logic/action out of paths scanning | Kirill Smelkov | 2014-02-24 | 1 | -10/+14 |
| |/
|/| |
|
* | | combine-diff: simplify intersect_paths() further | Junio C Hamano | 2014-02-24 | 1 | -22/+12 |
* | | combine-diff: combine_diff_path.len is not needed anymore | Kirill Smelkov | 2014-02-24 | 1 | -21/+9 |
* | | combine-diff: optimize combine_diff_path sets intersection | Kirill Smelkov | 2014-02-24 | 1 | -21/+73 |
|/ |
|