Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/write-in-full-fix' into maint | Junio C Hamano | 2017-10-23 | 1 | -1/+1 |
|\ | |||||
| * | avoid "write_in_full(fd, buf, len) != len" pattern | Jeff King | 2017-09-14 | 1 | -1/+1 |
* | | Merge branch 'rj/no-sign-compare' into maint | Junio C Hamano | 2017-10-23 | 1 | -1/+1 |
|\ \ | |||||
| * | | ALLOC_GROW: avoid -Wsign-compare warnings | Ramsay Jones | 2017-09-22 | 1 | -1/+1 |
| |/ | |||||
* / | Revert "color: check color.ui in git_default_config()" | Jeff King | 2017-10-17 | 1 | -0/+3 |
|/ | |||||
* | color: check color.ui in git_default_config() | Jeff King | 2017-07-13 | 1 | -3/+0 |
* | Merge branch 'rs/use-div-round-up' | Junio C Hamano | 2017-07-13 | 1 | -1/+1 |
|\ | |||||
| * | use DIV_ROUND_UP | René Scharfe | 2017-07-10 | 1 | -1/+1 |
* | | Merge branch 'ab/free-and-null' | Junio C Hamano | 2017-06-24 | 1 | -4/+2 |
|\ \ | |||||
| * | | coccinelle: make use of the "type" FREE_AND_NULL() rule | Ævar Arnfjörð Bjarmason | 2017-06-16 | 1 | -4/+2 |
* | | | Merge branch 'bw/config-h' | Junio C Hamano | 2017-06-24 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | config: don't include config.h by default | Brandon Williams | 2017-06-15 | 1 | -0/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'bw/ls-files-sans-the-index' | Junio C Hamano | 2017-06-24 | 1 | -3/+3 |
|\ \ \ | |||||
| * | | | convert: convert convert_to_git to take an index | Brandon Williams | 2017-06-13 | 1 | -3/+3 |
* | | | | Merge branch 'bw/object-id' | Junio C Hamano | 2017-06-19 | 1 | -38/+38 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | diff: rename diff_fill_sha1_info to diff_fill_oid_info | Brandon Williams | 2017-06-05 | 1 | -9/+9 |
| * | | | diff: convert diff_flush_patch_id to struct object_id | Brandon Williams | 2017-06-02 | 1 | -6/+6 |
| * | | | diff: finish conversion for prepare_temp_file to struct object_id | Brandon Williams | 2017-06-02 | 1 | -2/+2 |
| * | | | diff: convert reuse_worktree_file 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 | -8/+8 |
| * | | | diff: convert diff_change to struct object_id | Brandon Williams | 2017-06-02 | 1 | -7/+7 |
| * | | | diff: convert diff_addremove to struct object_id | Brandon Williams | 2017-06-02 | 1 | -4/+4 |
* | | | | Merge branch 'nd/fopen-errors' | Junio C Hamano | 2017-06-13 | 1 | -6/+2 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | use xfopen() in more places | Nguyễn Thái Ngọc Duy | 2017-05-26 | 1 | -6/+2 |
* | | | | Merge branch 'js/blame-lib' | Junio C Hamano | 2017-06-05 | 1 | -0/+23 |
|\ \ \ \ | |||||
| * | | | | blame: move textconv_object with related functions | Jeff Smith | 2017-05-24 | 1 | -0/+23 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'mb/diff-default-to-indent-heuristics' | Junio C Hamano | 2017-06-05 | 1 | -4/+4 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | diff: enable indent heuristic by default | Stefan Beller | 2017-05-09 | 1 | -1/+1 |
| * | | | diff: make the indent heuristic part of diff's basic configuration | Marc Branchaud | 2017-05-09 | 1 | -3/+3 |
| | |/ | |/| | |||||
* | | | Merge branch 'bc/object-id' | Junio C Hamano | 2017-05-29 | 1 | -2/+2 |
|\ \ \ | |_|/ |/| | | |||||
| * | | notes-cache: convert to struct object_id | brian m. carlson | 2017-05-08 | 1 | -2/+2 |
| |/ | |||||
* / | fix minor typos | René Genz | 2017-05-01 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'bc/object-id' | Junio C Hamano | 2017-04-20 | 1 | -2/+2 |
|\ | |||||
| * | Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZ | brian m. carlson | 2017-03-27 | 1 | -2/+2 |
* | | diff: avoid fixed-size buffer for patch-ids | Jeff King | 2017-03-30 | 1 | -31/+37 |
* | | prefix_filename: return newly allocated string | Jeff King | 2017-03-21 | 1 | -3/+3 |
* | | prefix_filename: drop length parameter | Jeff King | 2017-03-21 | 1 | -2/+2 |
|/ | |||||
* | Merge branch 'jc/diff-populate-filespec-size-only-fix' | Junio C Hamano | 2017-03-13 | 1 | -1/+18 |
|\ | |||||
| * | diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec() | Junio C Hamano | 2017-03-02 | 1 | -1/+18 |
* | | Merge branch 'rs/swap' | Junio C Hamano | 2017-02-15 | 1 | -8/+4 |
|\ \ | |||||
| * | | diff: use SWAP macro | René Scharfe | 2017-01-30 | 1 | -3/+1 |
| * | | use SWAP macro | René Scharfe | 2017-01-30 | 1 | -5/+3 |
* | | | Merge branch 'jk/log-graph-name-only' | Junio C Hamano | 2017-02-10 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | diff: print line prefix for --name-only output | Jeff King | 2017-02-08 | 1 | -0/+1 |
| * | | | Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' into maint | Junio C Hamano | 2016-08-10 | 1 | -0/+7 |
| |\ \ \ | |||||
* | | | | | use oid_to_hex_r() for converting struct object_id hashes to hex strings | René Scharfe | 2017-01-30 | 1 | -1/+1 |
| |_|/ / |/| | | | |||||
* | | | | diff: add interhunk context config option | Vegard Nossum | 2017-01-12 | 1 | -0/+8 |
* | | | | Merge branch 'jc/retire-compaction-heuristics' | Junio C Hamano | 2017-01-11 | 1 | -20/+3 |
|\ \ \ \ | |||||
| * | | | | diff: retire "compaction" heuristics | Junio C Hamano | 2016-12-23 | 1 | -20/+3 |
* | | | | | diff: handle --no-abbrev in no-index case | Jack Bates | 2016-12-08 | 1 | -1/+5 |