Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/i18n' | Junio C Hamano | 2018-08-16 | 1 | -2/+2 |
|\ | |||||
| * | Update messages in preparation for i18n | Nguyễn Thái Ngọc Duy | 2018-07-23 | 1 | -2/+2 |
* | | Merge branch 'es/diff-color-moved-fix' | Junio C Hamano | 2018-08-16 | 1 | -1/+3 |
|\ \ | |||||
| * | | diff: --color-moved: rename "dimmed_zebra" to "dimmed-zebra" | Eric Sunshine | 2018-07-25 | 1 | -1/+3 |
| * | | Merge branch 'nd/diff-flush-before-warning' into maint | Junio C Hamano | 2018-03-22 | 1 | -0/+1 |
| |\ \ | |||||
| * \ \ | Merge branch 'nd/ita-wt-renames-in-status' into maint | Junio C Hamano | 2018-02-27 | 1 | -1/+1 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'sb/diff-color-move-more' | Junio C Hamano | 2018-08-03 | 1 | -26/+236 |
|\ \ \ \ \ | |||||
| * | | | | | diff.c: offer config option to control ws handling in move detection | Stefan Beller | 2018-07-19 | 1 | -0/+9 |
| * | | | | | diff.c: add white space mode to move detection that allows indent changes | Stefan Beller | 2018-07-19 | 1 | -2/+156 |
| * | | | | | diff.c: factor advance_or_nullify out of mark_color_as_moved | Stefan Beller | 2018-07-17 | 1 | -12/+20 |
| * | | | | | diff.c: decouple white space treatment from move detection algorithm | Stefan Beller | 2018-07-17 | 1 | -2/+37 |
| * | | | | | diff.c: add a blocks mode for moved code detection | Stefan Beller | 2018-07-17 | 1 | -2/+4 |
| * | | | | | diff.c: adjust hash function signature to match hashmap expectation | Stefan Beller | 2018-07-17 | 1 | -7/+9 |
| * | | | | | diff.c: do not pass diff options as keydata to hashmap | Stefan Beller | 2018-07-17 | 1 | -2/+2 |
* | | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2018-08-03 | 1 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff: switch GIT_SHA1_HEXSZ to use the_hash_algo | brian m. carlson | 2018-07-16 | 1 | -3/+3 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'sb/object-store-grafts' | Junio C Hamano | 2018-07-18 | 1 | -0/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | object-store: move object access functions to object-store.h | Stefan Beller | 2018-05-16 | 1 | -0/+1 |
* | | | | | | Merge branch 'nd/complete-config-vars' | Junio C Hamano | 2018-06-25 | 1 | -32/+24 |
|\ \ \ \ \ \ | |||||
| * | | | | | | help: add --config to list all available config | Nguyễn Thái Ngọc Duy | 2018-05-29 | 1 | -0/+3 |
| * | | | | | | Add and use generic name->id mapping code for color slot parsing | Nguyễn Thái Ngọc Duy | 2018-05-29 | 1 | -32/+21 |
| |/ / / / / | |||||
* | | | | | | 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-summary | Nguyễn Thái Ngọc Duy | 2018-02-28 | 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 warnings | 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_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 manually | Stefan Beller | 2018-01-05 | 1 | -10/+5 |
| * | | | | | | diff: properly error out when combining multiple pickaxe options | Stefan Beller | 2018-01-05 | 1 | -0/+3 |
| * | | | | | | diffcore: add a pickaxe option to find a specific blob | Stefan Beller | 2018-01-05 | 1 | -1/+20 |