Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'sb/branch-avoid-repeated-strbuf-release' into maint | Junio C Hamano | 2017-10-18 |
|\ | |||
| * | branch: reset instead of release a strbuf | Stefan Beller | 2017-10-04 |
* | | Merge branch 'mg/timestamp-t-fix' into maint | Junio C Hamano | 2017-10-18 |
|\ \ | |||
| * | | name-rev: change ULONG_MAX to TIME_MAX | Michael J Gruber | 2017-09-06 |
* | | | Merge branch 'jk/diff-blob' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ | |||
| * | | | cat-file: handle NULL object_context.path | Jeff King | 2017-09-22 |
* | | | | Merge branch 'jk/describe-omit-some-refs' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ \ | |||
| * | | | | describe: fix matching to actually match all patterns | Max Kirillov | 2017-09-17 |
* | | | | | Merge branch 'aw/gc-lockfile-fscanf-fix' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ \ \ | |||
| * | | | | | gc: call fscanf() with %<len>s, not %<len>c, when reading hostname | Junio C Hamano | 2017-09-17 |
* | | | | | | Merge branch 'rk/commit-tree-make-F-verbatim' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ \ \ \ | |||
| * | | | | | | commit-tree: do not complete line in -F input | Ross Kabus | 2017-09-10 |
* | | | | | | | Merge branch 'mh/packed-ref-store-prep' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||
| * | | | | | | rev-parse: don't trim bisect refnames | Jeff King | 2017-09-07 |
* | | | | | | | Merge branch 'rs/merge-microcleanup' into maint | Junio C Hamano | 2017-09-10 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | merge: use skip_prefix() | René Scharfe | 2017-08-10 |
* | | | | | | | | Merge branch 'rj/add-chmod-error-message' into maint | Junio C Hamano | 2017-09-10 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | builtin/add: add detail to a 'cannot chmod' error message | Ramsay Jones | 2017-08-09 |
* | | | | | | | | | Merge branch 'mg/killed-merge' into maint | Junio C Hamano | 2017-09-10 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | merge: save merge state earlier | Michael J Gruber | 2017-08-23 |
| * | | | | | | | | | merge: split write_merge_state in two | Michael J Gruber | 2017-08-23 |
| * | | | | | | | | | merge: clarify call chain | Michael J Gruber | 2017-08-23 |
* | | | | | | | | | | Merge branch 'rs/fsck-obj-leakfix' into maint | Junio C Hamano | 2017-09-10 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | fsck: free buffers on error in fsck_obj() | René Scharfe | 2017-08-10 |
* | | | | | | | | | | | Merge branch 'pw/am-signoff' into maint | Junio C Hamano | 2017-09-10 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | am: fix signoff when other trailers are present | Phillip Wood | 2017-08-08 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'bw/clone-recursive-quiet' into maint | Junio C Hamano | 2017-09-10 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | clone: teach recursive clones to respect -q | Brandon Williams | 2017-08-04 |
| |/ / / / / / / / / / | |||
| * | | | | | | | | | | Merge branch 'jk/gc-pre-detach-under-hook' into maint | Junio C Hamano | 2017-07-31 |
| |\ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ | Merge branch 'pw/sequence-rerere-autoupdate' into maint | Junio C Hamano | 2017-09-10 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | cherry-pick/revert: reject --rerere-autoupdate when continuing | Phillip Wood | 2017-08-02 |
| * | | | | | | | | | | | | am: remember --rerere-autoupdate setting | Phillip Wood | 2017-08-02 |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'bw/push-options-recursively-to-submodules' into maint | Junio C Hamano | 2017-09-10 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | submodule--helper: teach push-check to handle HEAD | Brandon Williams | 2017-07-20 |
* | | | | | | | | | | | | | Merge branch 'ma/pager-per-subcommand-action' into maint | Junio C Hamano | 2017-09-10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | tag: change default of `pager.tag` to "on" | Martin Ågren | 2017-08-03 |
| * | | | | | | | | | | | | | tag: respect `pager.tag` in list-mode only | Martin Ågren | 2017-08-03 |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | | Merge branch 'jk/rev-list-empty-input' into maint | Junio C Hamano | 2017-09-10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | rev-list: don't show usage when we see empty ref patterns | Jeff King | 2017-08-02 |
| |/ / / / / / / / / / / | |||
* | | | | | | | | | | | | Merge branch 'jt/subprocess-handshake' into maint | Junio C Hamano | 2017-08-23 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshake | Junio C Hamano | 2017-07-26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||
| | * | | | | | | | | | | | convert: add "status=delayed" to filter process protocol | Lars Schneider | 2017-06-30 |
* | | | | | | | | | | | | | Merge branch 'dc/fmt-merge-msg-microcleanup' into maint | Junio C Hamano | 2017-08-23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | fmt-merge-msg: fix coding style | Dimitrios Christidis | 2017-07-25 |
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | | Merge branch 'js/run-process-parallel-api-fix' into maint | Junio C Hamano | 2017-08-23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | run_processes_parallel: change confusing task_cb convention | Johannes Schindelin | 2017-07-21 |
* | | | | | | | | | | | | | | Merge branch 'rs/pack-objects-pbase-cleanup' into maint | Junio C Hamano | 2017-08-23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | pack-objects: remove unnecessary NULL check | René Scharfe | 2017-07-20 |
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | Merge branch 'jt/fsck-code-cleanup' into maint | Junio C Hamano | 2017-08-23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | fsck: cleanup unused variable | Jonathan Tan | 2017-07-26 |