summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | commit: check for empty message before the check for untouched templateks/commit-abort-on-empty-message-fixKaartic Sivaraam2017-07-171-5/+5
| |/ / / / / / / /
* | | | | | | | | Merge branch 'sb/hashmap-cleanup'Junio C Hamano2017-08-1112-75/+107
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t/helper/test-hashmap: use custom data instead of duplicate cmp functionssb/hashmap-cleanupStefan Beller2017-07-051-18/+16
| * | | | | | | | | name-hash.c: drop hashmap_cmp_fn castStefan Beller2017-07-051-9/+13
| * | | | | | | | | submodule-config.c: drop hashmap_cmp_fn castStefan Beller2017-07-051-6/+12
| * | | | | | | | | remote.c: drop hashmap_cmp_fn castStefan Beller2017-07-051-4/+8
| * | | | | | | | | patch-ids.c: drop hashmap_cmp_fn castStefan Beller2017-07-051-5/+9
| * | | | | | | | | convert/sub-process: drop cast to hashmap_cmp_fnStefan Beller2017-07-053-6/+8
| * | | | | | | | | config.c: drop hashmap_cmp_fn castStefan Beller2017-07-051-4/+6
| * | | | | | | | | builtin/describe: drop hashmap_cmp_fn castStefan Beller2017-07-051-3/+6
| * | | | | | | | | builtin/difftool.c: drop hashmap_cmp_fn castStefan Beller2017-07-051-15/+22
| * | | | | | | | | attr.c: drop hashmap_cmp_fn castStefan Beller2017-07-051-5/+7
* | | | | | | | | | Merge branch 'jk/reflog-walk'Junio C Hamano2017-08-118-122/+253
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | reflog-walk: apply --since/--until to reflog datesjk/reflog-walkJeff King2017-07-094-3/+55
| * | | | | | | | | | reflog-walk: stop using fake parentsJeff King2017-07-095-108/+75
| * | | | | | | | | | rev-list: check reflog_info before showing usageJeff King2017-07-094-1/+13
| * | | | | | | | | | get_revision_1(): replace do-while with an early returnJeff King2017-07-091-6/+5
| * | | | | | | | | | log: do not free parents when walking reflogJeff King2017-07-091-2/+2
| * | | | | | | | | | log: clarify comment about reflog cyclesJeff King2017-07-091-1/+4
| * | | | | | | | | | revision: disallow reflog walking with revs->limitedJeff King2017-07-071-0/+2
| * | | | | | | | | | t1414: document some reflog-walk odditiesJeff King2017-07-072-10/+105
| * | | | | | | | | | Merge branch 'jk/reflog-walk-maint' into jk/reflog-walkJunio C Hamano2017-07-073-12/+42
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/filter-process-delayed'Junio C Hamano2017-08-119-161/+668
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | convert: add "status=delayed" to filter process protocolLars Schneider2017-06-309-90/+575
| * | | | | | | | | | | convert: refactor capabilities negotiationLars Schneider2017-06-301-12/+27
| * | | | | | | | | | | convert: move multiple file filter error handling to separate functionLars Schneider2017-06-291-21/+26
| * | | | | | | | | | | convert: put the flags field before the flag itself for consistent styleLars Schneider2017-06-291-5/+5
| * | | | | | | | | | | t0021: write "OUT <size>" only on successLars Schneider2017-06-292-6/+6
| * | | | | | | | | | | t0021: make debug log file name configurableLars Schneider2017-06-262-25/+27
| * | | | | | | | | | | t0021: keep filter log files on comparisonLars Schneider2017-06-261-6/+6
* | | | | | | | | | | | Merge branch 'st/lib-gpg-kill-stray-agent'Junio C Hamano2017-08-111-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t: lib-gpg: flush gpg agent on startupst/lib-gpg-kill-stray-agentSantiago Torres2017-07-201-0/+1
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rs/pack-objects-pbase-cleanup'Junio C Hamano2017-08-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pack-objects: remove unnecessary NULL checkrs/pack-objects-pbase-cleanupRené Scharfe2017-07-201-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jt/fsck-code-cleanup'Junio C Hamano2017-08-113-27/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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 pathnamesjc/http-sslkey-and-ssl-cert-are-pathsJunio C Hamano2017-07-201-2/+2
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/c99'Junio C Hamano2017-08-113-10/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | clean.c: use designated initializerjk/c99Junio 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 colorsjk/ref-filter-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