summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | fsck: cleanup unused variableJonathan Tan2017-07-261-3/+1
| * | | | | | | | | object: remove "used" field from struct objectJonathan Tan2017-07-203-12/+15
| * | | | | | | | | fsck: remove redundant parse_tree() invocationJonathan Tan2017-07-201-12/+1
* | | | | | | | | | Merge branch 'jc/http-sslkey-and-ssl-cert-are-paths'Junio C Hamano2017-08-111-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | http.c: http.sslcert and http.sslkey are both pathnamesJunio C Hamano2017-07-201-2/+2
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/c99'Junio C Hamano2017-08-113-10/+21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | clean.c: use designated initializerJunio C Hamano2017-07-182-9/+20
| * | | | | | | | | | strbuf: use designated initializers in STRBUF_INITJeff King2017-07-141-1/+1
* | | | | | | | | | | Merge branch 'jk/ref-filter-colors'Junio C Hamano2017-08-1122-220/+362
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ref-filter: consult want_color() before emitting colorsJeff King2017-07-136-12/+93
| * | | | | | | | | | | pretty: respect color settings for %C placeholdersJeff King2017-07-133-45/+84
| * | | | | | | | | | | rev-list: pass diffopt->use_colors through to pretty-printJeff King2017-07-132-0/+12
| * | | | | | | | | | | for-each-ref: load config earlierJeff King2017-07-131-3/+2
| * | | | | | | | | | | color: check color.ui in git_default_config()Jeff King2017-07-137-16/+8
| * | | | | | | | | | | ref-filter: pass ref_format struct to atom parsersJeff King2017-07-131-17/+25
| * | | | | | | | | | | ref-filter: factor out the parsing of sorting atomsJeff King2017-07-131-4/+8
| * | | | | | | | | | | ref-filter: make parse_ref_filter_atom a private functionJeff King2017-07-132-3/+1
| * | | | | | | | | | | ref-filter: provide a function for parsing sort optionsJeff King2017-07-133-30/+11
| * | | | | | | | | | | ref-filter: move need_color_reset_at_eol into ref_formatJeff King2017-07-132-4/+6
| * | | | | | | | | | | ref-filter: abstract ref format into its own structJeff King2017-07-136-52/+70
| * | | | | | | | | | | ref-filter: simplify automatic color resetJeff King2017-07-131-5/+1
| * | | | | | | | | | | t: use test_decode_color rather than literal ANSI codesJeff King2017-07-134-39/+44
| * | | | | | | | | | | docs/for-each-ref: update pointer to color syntaxJeff King2017-07-131-2/+4
| * | | | | | | | | | | check return value of verify_ref_format()Jeff King2017-07-133-5/+10
* | | | | | | | | | | | Merge branch 'wd/rebase-conflict-guide'Junio C Hamano2017-08-112-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | rebase: make resolve message clearer for inexperienced usersWilliam Duclot2017-07-172-5/+6
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rs/stat-data-unaligned-reads-fix'Junio C Hamano2017-08-111-23/+27
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | dir: support platforms that require aligned readsRené Scharfe2017-07-171-23/+27
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rs/move-array'Junio C Hamano2017-08-1112-34/+47
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ls-files: don't try to prune an empty indexRené Scharfe2017-07-171-1/+1
| * | | | | | | | | | | | apply: use COPY_ARRAY and MOVE_ARRAY in update_image()René Scharfe2017-07-171-7/+4
| * | | | | | | | | | | | use MOVE_ARRAYRené Scharfe2017-07-179-26/+17
| * | | | | | | | | | | | add MOVE_ARRAYRené Scharfe2017-07-172-0/+25
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rs/bswap-ubsan-fix'Junio C Hamano2017-08-111-14/+24
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | bswap: convert get_be16, get_be32 and put_be32 to inline functionsRené Scharfe2017-07-171-14/+24
| * | | | | | | | | | | | bswap: convert to unsigned before shifting in get_be32René Scharfe2017-07-171-4/+4
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ks/prepare-commit-msg-sample'Junio C Hamano2017-08-112-14/+20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | hook: add a simple first exampleKaartic Sivaraam2017-07-122-3/+9
| * | | | | | | | | | | | hook: add sign-off using "interpret-trailers"Kaartic Sivaraam2017-07-121-1/+5
| * | | | | | | | | | | | hook: name the positional variablesKaartic Sivaraam2017-07-121-3/+6
| * | | | | | | | | | | | hook: cleanup scriptKaartic Sivaraam2017-07-122-17/+10
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'bw/object-id'Junio C Hamano2017-08-113-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | receive-pack: don't access hash of NULL object_id pointerRené Scharfe2017-07-171-1/+1
| * | | | | | | | | | | | notes: don't access hash of NULL object_id pointerRené Scharfe2017-07-171-1/+1
| * | | | | | | | | | | | tree-diff: don't access hash of NULL object_id pointerRené Scharfe2017-07-171-2/+3
* | | | | | | | | | | | | Merge branch 'bc/object-id'Junio C Hamano2017-08-1138-357/+348
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | sha1_name: convert uses of 40 to GIT_SHA1_HEXSZbrian m. carlson2017-07-171-3/+3
| * | | | | | | | | | | | | sha1_name: convert GET_SHA1* flags to GET_OID*brian m. carlson2017-07-178-56/+56
| * | | | | | | | | | | | | sha1_name: convert get_sha1* to get_oid*brian m. carlson2017-07-1720-153/+144
| * | | | | | | | | | | | | Convert remaining callers of get_sha1 to get_oid.brian m. carlson2017-07-172-5/+5