Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bc/object-id' | Junio C Hamano | 2018-05-30 | 1 | -7/+13 |
|\ | |||||
| * | diff: specify abbreviation size in terms of the_hash_algo | brian m. carlson | 2018-05-02 | 1 | -6/+12 |
| * | packfile: convert has_sha1_pack to object_id | brian m. carlson | 2018-05-02 | 1 | -1/+1 |
* | | Merge branch 'js/use-bug-macro' | Junio C Hamano | 2018-05-30 | 1 | -6/+6 |
|\ \ | |||||
| * | | Replace all die("BUG: ...") calls by BUG() ones | Johannes Schindelin | 2018-05-06 | 1 | -6/+6 |
| |/ | |||||
* | | Merge branch 'bp/merge-rename-config' | Junio C Hamano | 2018-05-30 | 1 | -1/+1 |
|\ \ | |||||
| * | | merge: add merge.renames config setting | Ben Peart | 2018-05-08 | 1 | -1/+1 |
| |/ | |||||
* | | cache.h: add repository argument to oid_object_info | Stefan Beller | 2018-04-26 | 1 | -1/+2 |
|/ | |||||
* | Merge branch 'bc/object-id' | Junio C Hamano | 2018-04-10 | 1 | -3/+3 |
|\ | |||||
| * | sha1_file: convert read_sha1_file to struct object_id | brian m. carlson | 2018-03-14 | 1 | -1/+1 |
| * | sha1_file: convert sha1_object_info* to object_id | brian m. carlson | 2018-03-14 | 1 | -1/+1 |
| * | Convert find_unique_abbrev* to struct object_id | brian m. carlson | 2018-03-14 | 1 | -1/+1 |
* | | Merge branch 'nd/diff-stat-with-summary' | Junio C Hamano | 2018-03-14 | 1 | -33/+63 |
|\ \ | |/ |/| | |||||
| * | diff: add --compact-summarynd/diff-stat-with-summary | Nguyễn Thái Ngọc Duy | 2018-02-27 | 1 | -0/+37 |
| * | diff.c: refactor pprint_rename() to use strbuf | Nguyễn Thái Ngọc Duy | 2018-02-02 | 1 | -33/+26 |
* | | Merge branch 'bw/c-plus-plus' | Junio C Hamano | 2018-03-06 | 1 | -35/+35 |
|\ \ | |||||
| * | | diff: rename 'template' variables | Brandon Williams | 2018-02-22 | 1 | -5/+5 |
| * | | diff: rename 'new' variables | Brandon Williams | 2018-02-22 | 1 | -22/+22 |
| * | | diff: rename 'this' variables | Brandon Williams | 2018-02-22 | 1 | -8/+8 |
* | | | Merge branch 'nd/diff-flush-before-warning' | Junio C Hamano | 2018-02-13 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | diff.c: flush stdout before printing rename warningsnd/diff-flush-before-warning | Nguyễn Thái Ngọc Duy | 2018-01-16 | 1 | -0/+1 |
| * | | | Merge branch 'tk/diffcore-delta-remove-unused' into maint | Junio C Hamano | 2016-11-29 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'rs/cocci' into maint | Junio C Hamano | 2016-10-28 | 1 | -1/+1 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'tb/crlf-conv-flags' | Junio C Hamano | 2018-02-13 | 1 | -4/+4 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | convert_to_git(): safe_crlf/checksafe becomes int conv_flagstb/crlf-conv-flags | Torsten Bögershausen | 2018-01-16 | 1 | -4/+4 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'sb/diff-blobfind-pickaxe' | Junio C Hamano | 2018-01-23 | 1 | -13/+30 |
|\ \ \ \ \ | |||||
| * | | | | | diff: use HAS_MULTI_BITS instead of counting bits manuallysb/diff-blobfind-pickaxe | Stefan Beller | 2018-01-04 | 1 | -10/+5 |
| * | | | | | diff: properly error out when combining multiple pickaxe options | Stefan Beller | 2018-01-04 | 1 | -0/+3 |
| * | | | | | diffcore: add a pickaxe option to find a specific blob | Stefan Beller | 2018-01-04 | 1 | -1/+20 |
| * | | | | | diff: introduce DIFF_PICKAXE_KINDS_MASK | Stefan Beller | 2018-01-04 | 1 | -2/+2 |
* | | | | | | Merge branch 'nd/ita-wt-renames-in-status' | Junio C Hamano | 2018-01-23 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Use DIFF_DETECT_RENAME for detect_rename assignments | Nguyễn Thái Ngọc Duy | 2017-12-27 | 1 | -1/+1 |
* | | | | | | Merge branch 'cc/skip-to-optional-val' | Junio C Hamano | 2017-12-28 | 1 | -34/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff: use skip_to_optional_arg_default() in parsing --relative | Junio C Hamano | 2017-12-11 | 1 | -4/+3 |
| * | | | | | | diff: use skip_to_optional_arg_default() | Christian Couder | 2017-12-11 | 1 | -16/+4 |
| * | | | | | | diff: use skip_to_optional_arg() | Christian Couder | 2017-12-11 | 1 | -14/+9 |
* | | | | | | | Merge branch 'ar/unconfuse-three-dots' | Junio C Hamano | 2017-12-19 | 1 | -1/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value | Ann T Ropea | 2017-12-06 | 1 | -1/+7 |
* | | | | | | | | Merge branch 'jt/diff-anchored-patience' | Junio C Hamano | 2017-12-19 | 1 | -2/+20 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | diff: support anchoring line(s)jt/diff-anchored-patience | Jonathan Tan | 2017-11-28 | 1 | -2/+20 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'en/rename-progress' | Junio C Hamano | 2017-12-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | diff: remove silent clamp of renameLimit | Elijah Newren | 2017-11-15 | 1 | -1/+1 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jc/ignore-cr-at-eol' | Junio C Hamano | 2017-11-27 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | diff: --ignore-cr-at-eoljc/ignore-cr-at-eol | Junio C Hamano | 2017-11-08 | 1 | -0/+2 |
| * | | | | | | xdiff: reassign xpparm_t.flags bits | Junio C Hamano | 2017-10-27 | 1 | -3/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'bw/diff-opt-impl-to-bitfields' | Junio C Hamano | 2017-11-09 | 1 | -87/+88 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff: make struct diff_flags members lowercasebw/diff-opt-impl-to-bitfields | Brandon Williams | 2017-11-01 | 1 | -85/+85 |
| * | | | | | | diff: remove DIFF_OPT_CLR macro | Brandon Williams | 2017-11-01 | 1 | -14/+14 |
| * | | | | | | diff: remove DIFF_OPT_SET macro | Brandon Williams | 2017-11-01 | 1 | -33/+33 |
| * | | | | | | diff: remove DIFF_OPT_TST macro | Brandon Williams | 2017-11-01 | 1 | -38/+38 |