aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'eb/contacts-reported-by'Junio C Hamano2017-08-11
|\
| * git-contacts: also recognise "Reported-by:"Eric Blake2017-07-27
* | Merge branch 'dl/credential-cache-socket-in-xdg-cache'Junio C Hamano2017-08-11
|\ \
| * | credential-cache: interpret an ECONNRESET as an EOFRamsay Jones2017-07-27
* | | Merge branch 'rg/rerere-train-overwrite'Junio C Hamano2017-08-11
|\ \ \
| * | | contrib/rerere-train: optionally overwrite existing resolutionsRaman Gupta2017-07-26
| | |/ | |/|
* | | Merge branch 'jb/t8008-cleanup'Junio C Hamano2017-08-11
|\ \ \
| * | | t8008: rely on rev-parse'd HEAD instead of sha1 valueStefan Beller2017-07-26
| |/ /
* | | Merge branch 'jt/subprocess-handshake'Junio C Hamano2017-08-11
|\ \ \
| * | | sub-process: refactor handshake to common functionJonathan Tan2017-07-26
| * | | Documentation: migrate sub-process docs to headerJonathan Tan2017-07-26
| * | | Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshakeJunio C Hamano2017-07-26
| |\ \ \ | | |/ / | |/| |
* | | | Merge branch 'dc/fmt-merge-msg-microcleanup'Junio C Hamano2017-08-11
|\ \ \ \
| * | | | fmt-merge-msg: fix coding styleDimitrios Christidis2017-07-25
* | | | | Merge branch 'ah/doc-wserrorhighlight'Junio C Hamano2017-08-11
|\ \ \ \ \
| * | | | | doc: add missing values "none" and "default" for diff.wsErrorHighlightAndreas Heiduk2017-07-25
| |/ / / /
* | | | | Merge branch 'cc/ref-is-hidden-microcleanup'Junio C Hamano2017-08-11
|\ \ \ \ \
| * | | | | refs: use skip_prefix() in ref_is_hidden()Christian Couder2017-07-24
| |/ / / /
* | | | | Merge branch 'js/run-process-parallel-api-fix'Junio C Hamano2017-08-11
|\ \ \ \ \
| * | | | | run_processes_parallel: change confusing task_cb conventionJohannes Schindelin2017-07-21
* | | | | | Merge branch 'hb/gitweb-project-list'Junio C Hamano2017-08-11
|\ \ \ \ \ \
| * | | | | | gitweb: skip unreadable subdirectoriesHielke Christian Braun2017-07-18
* | | | | | | Merge branch 'ks/commit-abort-on-empty-message-fix'Junio C Hamano2017-08-11
|\ \ \ \ \ \ \
| * | | | | | | commit: check for empty message before the check for untouched templateKaartic Sivaraam2017-07-17
| |/ / / / / /
* | | | | | | Merge branch 'sb/hashmap-cleanup'Junio C Hamano2017-08-11
|\ \ \ \ \ \ \
| * | | | | | | t/helper/test-hashmap: use custom data instead of duplicate cmp functionsStefan Beller2017-07-05
| * | | | | | | name-hash.c: drop hashmap_cmp_fn castStefan Beller2017-07-05
| * | | | | | | submodule-config.c: drop hashmap_cmp_fn castStefan Beller2017-07-05
| * | | | | | | remote.c: drop hashmap_cmp_fn castStefan Beller2017-07-05
| * | | | | | | patch-ids.c: drop hashmap_cmp_fn castStefan Beller2017-07-05
| * | | | | | | convert/sub-process: drop cast to hashmap_cmp_fnStefan Beller2017-07-05
| * | | | | | | config.c: drop hashmap_cmp_fn castStefan Beller2017-07-05
| * | | | | | | builtin/describe: drop hashmap_cmp_fn castStefan Beller2017-07-05
| * | | | | | | builtin/difftool.c: drop hashmap_cmp_fn castStefan Beller2017-07-05
| * | | | | | | attr.c: drop hashmap_cmp_fn castStefan Beller2017-07-05
* | | | | | | | Merge branch 'jk/reflog-walk'Junio C Hamano2017-08-11
|\ \ \ \ \ \ \ \
| * | | | | | | | reflog-walk: apply --since/--until to reflog datesJeff King2017-07-09
| * | | | | | | | reflog-walk: stop using fake parentsJeff King2017-07-09
| * | | | | | | | rev-list: check reflog_info before showing usageJeff King2017-07-09
| * | | | | | | | get_revision_1(): replace do-while with an early returnJeff King2017-07-09
| * | | | | | | | log: do not free parents when walking reflogJeff King2017-07-09
| * | | | | | | | log: clarify comment about reflog cyclesJeff King2017-07-09
| * | | | | | | | revision: disallow reflog walking with revs->limitedJeff King2017-07-07
| * | | | | | | | t1414: document some reflog-walk odditiesJeff King2017-07-07
| * | | | | | | | Merge branch 'jk/reflog-walk-maint' into jk/reflog-walkJunio C Hamano2017-07-07
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'ls/filter-process-delayed'Junio C Hamano2017-08-11
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | convert: add "status=delayed" to filter process protocolLars Schneider2017-06-30
| * | | | | | | | | convert: refactor capabilities negotiationLars Schneider2017-06-30
| * | | | | | | | | convert: move multiple file filter error handling to separate functionLars Schneider2017-06-29
| * | | | | | | | | convert: put the flags field before the flag itself for consistent styleLars Schneider2017-06-29