Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | diff: prepare for additional submodule formats | Jacob Keller | 2016-08-31 | 1 | -6/+6 | |
| * | | | | | graph: add support for --line-prefix on all graph-aware output | Jacob Keller | 2016-08-31 | 1 | -0/+7 | |
| * | | | | | diff.c: remove output_prefix_length field | Junio C Hamano | 2016-08-31 | 1 | -1/+1 | |
* | | | | | | Merge branch 'kw/patch-ids-optim' | Junio C Hamano | 2016-08-12 | 1 | -6/+10 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | patch-ids: add flag to create the diff patch id using header only data | Kevin Willford | 2016-07-29 | 1 | -6/+10 | |
| |/ / / / | ||||||
* | | | | | Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' | Junio C Hamano | 2016-08-03 | 1 | -0/+7 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | ||||||
| * | | | | diff: do not reuse worktree files that need "clean" conversionjk/diff-do-not-reuse-wtf-needs-cleaning | Jeff King | 2016-07-22 | 1 | -0/+7 | |
| | |/ / | |/| | | ||||||
* | | | | Merge branch 'bc/cocci' | Junio C Hamano | 2016-07-19 | 1 | -46/+53 | |
|\ \ \ \ | ||||||
| * | | | | diff: convert prep_temp_blob() to struct object_idbc/cocci | brian m. carlson | 2016-06-28 | 1 | -4/+4 | |
| * | | | | diff: rename struct diff_filespec's sha1_valid member | brian m. carlson | 2016-06-28 | 1 | -14/+14 | |
| * | | | | diff: convert struct diff_filespec to struct object_id | brian m. carlson | 2016-06-28 | 1 | -31/+38 | |
| * | | | | coccinelle: convert hashcpy() with null_sha1 to hashclr() | brian m. carlson | 2016-06-28 | 1 | -1/+1 | |
| | |/ / | |/| | | ||||||
* | | | | diff: do not color output when --color=auto and --output=<file> is given | Johannes Schindelin | 2016-06-28 | 1 | -0/+2 | |
|/ / / | ||||||
* | | | Merge branch 'jk/diff-compact-heuristic' | Junio C Hamano | 2016-06-10 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | diff: disable compaction heuristic for nowjk/diff-compact-heuristic | Junio C Hamano | 2016-06-10 | 1 | -1/+1 | |
* | | | | Merge branch 'jk/diff-compact-heuristic' | Junio C Hamano | 2016-05-06 | 1 | -0/+11 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | xdiff: implement empty line chunk heuristic | Stefan Beller | 2016-04-19 | 1 | -0/+11 | |
* | | | | Merge branch 'mm/diff-renames-default' | Junio C Hamano | 2016-04-03 | 1 | -0/+5 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | diff: activate diff.renames by defaultmm/diff-renames-default | Matthieu Moy | 2016-02-25 | 1 | -0/+5 | |
* | | | | Merge branch 'jk/tighten-alloc' | Junio C Hamano | 2016-02-26 | 1 | -13/+10 | |
|\ \ \ \ | ||||||
| * | | | | diff_populate_gitlink: use a strbuf | Jeff King | 2016-02-22 | 1 | -8/+8 | |
| * | | | | convert trivial cases to FLEX_ARRAY macros | Jeff King | 2016-02-22 | 1 | -5/+2 | |
| * | | | | Merge branch 'nd/diff-with-path-params' into maint | Junio C Hamano | 2016-02-05 | 1 | -4/+10 | |
| |\ \ \ \ | ||||||
* | \ \ \ \ | Merge branch 'jk/more-comments-on-textconv' | Junio C Hamano | 2016-02-26 | 1 | -1/+4 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | diff: clarify textconv interfacejk/more-comments-on-textconv | Jeff King | 2016-02-22 | 1 | -1/+4 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge branch 'nd/diff-with-path-params' | Junio C Hamano | 2016-02-03 | 1 | -4/+10 | |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | ||||||
| * | | | diff: make -O and --output work in subdirectorynd/diff-with-path-params | Duy Nguyen | 2016-01-21 | 1 | -4/+10 | |
| | |/ | |/| | ||||||
* | | | Merge branch 'tk/sigchain-unnecessary-post-tempfile' | Junio C Hamano | 2015-10-29 | 1 | -1/+0 | |
|\ \ \ | ||||||
| * | | | diff: remove unused #include "sigchain.h" | Tobias Klauser | 2015-10-22 | 1 | -1/+0 | |
* | | | | Merge branch 'jk/war-on-sprintf' | Junio C Hamano | 2015-10-20 | 1 | -11/+10 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | use sha1_to_hex_r() instead of strcpy | Jeff King | 2015-10-05 | 1 | -5/+4 | |
| * | | | convert trivial sprintf / strcpy calls to xsnprintf | Jeff King | 2015-09-25 | 1 | -6/+6 | |
* | | | | Sync with v2.5.4 | Junio C Hamano | 2015-09-28 | 1 | -10/+16 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Sync with 2.4.10 | Junio C Hamano | 2015-09-28 | 1 | -10/+16 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| | * | | Sync with 2.3.10 | Junio C Hamano | 2015-09-28 | 1 | -10/+16 | |
| | |\ \ | ||||||
| | | * | | react to errors in xdi_diff | Jeff King | 2015-09-28 | 1 | -10/+16 | |
| | | * | | Merge branch 'rs/deflate-init-cleanup' into maint | Junio C Hamano | 2015-03-23 | 1 | -1/+0 | |
| | | |\ \ | ||||||
| | | * \ \ | Merge branch 'mk/diff-shortstat-dirstat-fix' into maint | Junio C Hamano | 2015-03-13 | 1 | -1/+1 | |
| | | |\ \ \ | ||||||
| | * | \ \ \ | Merge branch 'jk/color-diff-plain-is-context' into maint | Junio C Hamano | 2015-06-25 | 1 | -14/+14 | |
| | |\ \ \ \ \ | ||||||
* | | \ \ \ \ \ | Merge branch 'hv/submodule-config' | Junio C Hamano | 2015-08-31 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | submodule: use new config API for worktree configurations | Heiko Voigt | 2015-08-19 | 1 | -0/+1 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'mh/tempfile' | Junio C Hamano | 2015-08-25 | 1 | -23/+23 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | ||||||
| * | | | | | | | diff: use tempfile module | Michael Haggerty | 2015-08-12 | 1 | -23/+23 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge branch 'dt/log-follow-config' | Junio C Hamano | 2015-08-03 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | log: add "log.follow" configuration variable | David Turner | 2015-07-09 | 1 | -2/+3 | |
* | | | | | | | Merge branch 'jc/diff-ws-error-highlight' | Junio C Hamano | 2015-07-15 | 1 | -1/+6 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | diff: parse ws-error-highlight option more strictlyjc/diff-ws-error-highlight | René Scharfe | 2015-07-12 | 1 | -1/+6 | |
* | | | | | | | Merge branch 'jk/color-diff-plain-is-context' | Junio C Hamano | 2015-06-11 | 1 | -15/+15 | |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||||
| * | | | | | | diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTjk/color-diff-plain-is-context | Jeff King | 2015-05-27 | 1 | -13/+13 | |
| * | | | | | | diff: accept color.diff.context as a synonym for "plain" | Jeff King | 2015-05-27 | 1 | -1/+1 | |
| | |_|/ / / | |/| | | | |