Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'mk/blame-error-message' into maint | Junio C Hamano | 2015-11-03 |
|\ | |||
| * | blame: fix option name in error message | Max Kirillov | 2015-10-26 |
* | | Merge branch 'jk/merge-file-exit-code' into maint | Junio C Hamano | 2015-11-03 |
|\ \ | |||
| * | | merge-file: clamp exit code to maximum 127 | Jeff King | 2015-10-29 |
* | | | Merge branch 'jc/am-3-fallback-regression-fix' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ | |||
| * | | | am -3: do not let failed merge from completing the error codepath | Junio C Hamano | 2015-10-09 |
* | | | | Merge branch 'jc/usage-stdin' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ \ | |||
| * | | | | usage: do not insist that standard input must come from a file | Junio C Hamano | 2015-10-16 |
* | | | | | Merge branch 'rt/placeholder-in-usage' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ \ \ | |||
| * | | | | | am, credential-cache: add angle brackets to usage string | Ralf Thielow | 2015-10-16 |
| | |/ / / | |/| | | | |||
* | | | | | Merge branch 'nd/gc-auto-background-fix' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ \ \ | |||
| * | | | | | gc: save log from daemonized gc --auto and print it next time | Nguyễn Thái Ngọc Duy | 2015-09-21 |
* | | | | | | Merge branch 'js/clone-dissociate' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ \ \ \ | |||
| * | | | | | | clone --dissociate: avoid locking pack files | Johannes Schindelin | 2015-10-07 |
* | | | | | | | Merge branch 'tk/stripspace' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | stripspace: use parse-options for command-line parsing | Tobias Klauser | 2015-10-16 |
| * | | | | | | | strbuf: make stripspace() part of strbuf | Tobias Klauser | 2015-10-16 |
| | |_|/ / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'jk/repository-extension' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||
| * | | | | | | introduce "preciousObjects" repository extension | Jeff King | 2015-06-24 |
* | | | | | | | Merge branch 'nd/ls-remote-does-not-have-u-option' into maint | Junio C Hamano | 2015-10-16 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | ls-remote.txt: delete unsupported option | Nguyễn Thái Ngọc Duy | 2015-09-28 |
| | |_|/ / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'jc/fsck-dropped-errors' into maint | Junio C Hamano | 2015-10-16 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | fsck: exit with non-zero when problems are found | Junio C Hamano | 2015-09-23 |
* | | | | | | | | Merge branch 'pt/am-builtin' into maint | Junio C Hamano | 2015-10-16 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | am: configure gpg at startup | Renee Margaret McConahy | 2015-09-30 |
* | | | | | | | | | Merge branch 'jk/blame-first-parent' into maint | Junio C Hamano | 2015-10-16 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | blame: handle --first-parent | Jeff King | 2015-09-16 |
* | | | | | | | | | | Merge branch 'pt/pull-builtin' into maint | Junio C Hamano | 2015-10-16 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||
| * | | | | | | | | | pull: enclose <options> in brackets in the usage string | Alex Henrie | 2015-10-16 |
* | | | | | | | | | | Sync with v2.5.4 | Junio C Hamano | 2015-09-28 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Sync with 2.4.10 | Junio C Hamano | 2015-09-28 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | |||
| | * | | | | | | | | | Sync with 2.3.10 | Junio C Hamano | 2015-09-28 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | | | |||
| | | * | | | | | | | | merge-file: enforce MAX_XDIFF_SIZE on incoming files | Jeff King | 2015-09-28 |
| | | * | | | | | | | | react to errors in xdi_diff | Jeff King | 2015-09-28 |
| | | | |_|_|_|/ / / | | | |/| | | | | | | |||
* | | | | | | | | | | Merge branch 'ah/show-ref-usage-string' | Junio C Hamano | 2015-09-14 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | show-ref: place angle brackets around variables in usage string | Alex Henrie | 2015-08-31 |
* | | | | | | | | | | | Merge branch 'rt/help-strings-fix' | Junio C Hamano | 2015-09-14 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | tag, update-ref: improve description of option "create-reflog" | Ralf Thielow | 2015-09-11 |
| * | | | | | | | | | | | pull: don't mark values for option "rebase" for translation | Ralf Thielow | 2015-09-11 |
* | | | | | | | | | | | | Merge branch 'gb/apply-comment-typofix' | Junio C Hamano | 2015-09-14 |
* | | | | | | | | | | | | Sync with 2.5.2 | Junio C Hamano | 2015-09-09 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | / / / / / / / / / | | |/ / / / / / / / / | |/| | | | | | | | | | |||
| * | | | | | | | | | | Sync with 2.4.9 | Junio C Hamano | 2015-09-04 |
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | |||
| | * | | | | | | | | | Sync with 2.3.9 | Junio C Hamano | 2015-09-04 |
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | |||
| | | * | | | | | | | | Sync with 2.2.3 | Junio C Hamano | 2015-09-04 |
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ | | | | |/| | | | | | | |||
| | | | * | | | | | | | show-branch: use a strbuf for reflog descriptions | Jeff King | 2015-09-04 |
| * | | | | | | | | | | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd... | Junio C Hamano | 2015-09-03 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/calloc-pathspec' into maint | Junio C Hamano | 2015-09-03 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/rev-list-has-no-notes' into maint | Junio C Hamano | 2015-09-03 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/get-remote-group-fix' into maint | Junio C Hamano | 2015-09-03 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | Merge branch 'jc/builtin-am-signoff-regression-fix' | Junio C Hamano | 2015-09-08 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |