Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/repository-extension' into maint | Junio C Hamano | 2015-11-03 | 3 | -9/+17 |
|\ | |||||
| * | introduce "preciousObjects" repository extensionjk/repository-extension | Jeff King | 2015-06-24 | 3 | -9/+17 |
* | | Merge branch 'nd/ls-remote-does-not-have-u-option' into maint | Junio C Hamano | 2015-10-16 | 1 | -1/+1 |
|\ \ | |||||
| * | | ls-remote.txt: delete unsupported optionnd/ls-remote-does-not-have-u-option | Nguyễn Thái Ngọc Duy | 2015-09-28 | 1 | -1/+1 |
* | | | Merge branch 'jc/fsck-dropped-errors' into maint | Junio C Hamano | 2015-10-16 | 1 | -4/+14 |
|\ \ \ | |||||
| * | | | fsck: exit with non-zero when problems are foundjc/fsck-dropped-errors | Junio C Hamano | 2015-09-23 | 1 | -4/+14 |
* | | | | Merge branch 'pt/am-builtin' into maint | Junio C Hamano | 2015-10-16 | 1 | -1/+12 |
|\ \ \ \ | |||||
| * | | | | am: configure gpg at startuppt/am-builtin | Renee Margaret McConahy | 2015-09-30 | 1 | -1/+12 |
* | | | | | Merge branch 'jk/blame-first-parent' into maint | Junio C Hamano | 2015-10-16 | 1 | -1/+10 |
|\ \ \ \ \ | |||||
| * | | | | | blame: handle --first-parentjk/blame-first-parent | Jeff King | 2015-09-16 | 1 | -1/+10 |
* | | | | | | Merge branch 'pt/pull-builtin' into maint | Junio C Hamano | 2015-10-16 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | pull: enclose <options> in brackets in the usage stringpt/pull-builtin | Alex Henrie | 2015-10-16 | 1 | -1/+1 |
* | | | | | | | Sync with v2.5.4 | Junio C Hamano | 2015-09-28 | 4 | -8/+17 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Sync with 2.4.10 | Junio C Hamano | 2015-09-28 | 4 | -8/+17 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | Sync with 2.3.10 | Junio C Hamano | 2015-09-28 | 4 | -8/+17 |
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | | * | | | | | merge-file: enforce MAX_XDIFF_SIZE on incoming files | Jeff King | 2015-09-28 | 1 | -1/+2 |
| | | * | | | | | react to errors in xdi_diff | Jeff King | 2015-09-28 | 3 | -7/+15 |
* | | | | | | | | Merge branch 'ah/show-ref-usage-string' | Junio C Hamano | 2015-09-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | show-ref: place angle brackets around variables in usage stringah/show-ref-usage-string | Alex Henrie | 2015-08-31 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'rt/help-strings-fix' | Junio C Hamano | 2015-09-14 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | tag, update-ref: improve description of option "create-reflog"rt/help-strings-fix | Ralf Thielow | 2015-09-11 | 2 | -2/+2 |
| * | | | | | | | | | pull: don't mark values for option "rebase" for translation | Ralf Thielow | 2015-09-11 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'gb/apply-comment-typofix' | Junio C Hamano | 2015-09-14 | 1 | -1/+1 |
* | | | | | | | | | | Sync with 2.5.2 | Junio C Hamano | 2015-09-09 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Sync with 2.4.9 | Junio C Hamano | 2015-09-04 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Sync with 2.3.9 | Junio C Hamano | 2015-09-04 | 1 | -2/+4 |
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | |||||
| | | * | | | | | | Sync with 2.2.3 | Junio C Hamano | 2015-09-04 | 1 | -2/+4 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | show-branch: use a strbuf for reflog descriptions | Jeff King | 2015-09-04 | 1 | -2/+4 |
| * | | | | | | | | | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd... | Junio C Hamano | 2015-09-03 | 1 | -3/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/calloc-pathspec' into maint | Junio C Hamano | 2015-09-03 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/rev-list-has-no-notes' into maint | Junio C Hamano | 2015-09-03 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/get-remote-group-fix' into maint | Junio C Hamano | 2015-09-03 | 1 | -8/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'jc/builtin-am-signoff-regression-fix' | Junio C Hamano | 2015-09-08 | 1 | -2/+29 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | am: match --signoff to the original scripted versionjc/builtin-am-signoff-regression-fix | Junio C Hamano | 2015-09-06 | 1 | -2/+29 |
* | | | | | | | | | | | | | | Merge branch 'jk/am-rerere-lock-fix' | Junio C Hamano | 2015-09-03 | 2 | -14/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | rerere: release lockfile in non-writing functionsjk/am-rerere-lock-fix | Jeff King | 2015-09-01 | 2 | -14/+9 |
* | | | | | | | | | | | | | | | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd... | Junio C Hamano | 2015-09-01 | 1 | -3/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | commit: don't rewrite shared index unnecessarilydt/commit-preserve-base-index-upon-opportunistic-cache-tree-update | David Turner | 2015-08-31 | 1 | -3/+1 |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge branch 'jk/guess-repo-name-regression-fix' into maint | Junio C Hamano | 2015-08-25 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ah/reflog-typofix-in-error' | Junio C Hamano | 2015-09-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | reflog: add missing single quote to error messageah/reflog-typofix-in-error | Alex Henrie | 2015-08-28 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | Merge branch 'ah/read-tree-usage-string' | Junio C Hamano | 2015-09-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | read-tree: replace bracket set with parentheses to clarify usageah/read-tree-usage-string | Alex Henrie | 2015-08-28 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | Merge branch 'ah/pack-objects-usage-strings' | Junio C Hamano | 2015-09-01 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | pack-objects: place angle brackets around placeholders in usage stringsah/pack-objects-usage-strings | Alex Henrie | 2015-08-28 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | Merge branch 'sg/describe-contains' | Junio C Hamano | 2015-08-31 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | describe --contains: default to HEAD when no commit-ish is givensg/describe-contains | SZEDER Gábor | 2015-08-25 | 1 | -4/+4 |
* | | | | | | | | | | | | | | | | | | Merge branch 'db/push-sign-if-asked' | Junio C Hamano | 2015-08-31 | 2 | -106/+128 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | push: add a config option push.gpgSign for default signed pushesdb/push-sign-if-asked | Dave Borowitz | 2015-08-19 | 2 | -15/+62 |
| * | | | | | | | | | | | | | | | | | | push: support signing pushes iff the server supports it | Dave Borowitz | 2015-08-19 | 2 | -3/+23 |