summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/repository-extension' into maintJunio C Hamano2015-11-033-9/+17
|\
| * introduce "preciousObjects" repository extensionjk/repository-extensionJeff King2015-06-243-9/+17
* | Merge branch 'nd/ls-remote-does-not-have-u-option' into maintJunio C Hamano2015-10-161-1/+1
|\ \
| * | ls-remote.txt: delete unsupported optionnd/ls-remote-does-not-have-u-optionNguyễn Thái Ngọc Duy2015-09-281-1/+1
* | | Merge branch 'jc/fsck-dropped-errors' into maintJunio C Hamano2015-10-161-4/+14
|\ \ \
| * | | fsck: exit with non-zero when problems are foundjc/fsck-dropped-errorsJunio C Hamano2015-09-231-4/+14
* | | | Merge branch 'pt/am-builtin' into maintJunio C Hamano2015-10-161-1/+12
|\ \ \ \
| * | | | am: configure gpg at startuppt/am-builtinRenee Margaret McConahy2015-09-301-1/+12
* | | | | Merge branch 'jk/blame-first-parent' into maintJunio C Hamano2015-10-161-1/+10
|\ \ \ \ \
| * | | | | blame: handle --first-parentjk/blame-first-parentJeff King2015-09-161-1/+10
* | | | | | Merge branch 'pt/pull-builtin' into maintJunio C Hamano2015-10-161-1/+1
|\ \ \ \ \ \
| * | | | | | pull: enclose <options> in brackets in the usage stringpt/pull-builtinAlex Henrie2015-10-161-1/+1
* | | | | | | Sync with v2.5.4Junio C Hamano2015-09-284-8/+17
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Sync with 2.4.10Junio C Hamano2015-09-284-8/+17
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Sync with 2.3.10Junio C Hamano2015-09-284-8/+17
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | merge-file: enforce MAX_XDIFF_SIZE on incoming filesJeff King2015-09-281-1/+2
| | | * | | | | react to errors in xdi_diffJeff King2015-09-283-7/+15
* | | | | | | | Merge branch 'ah/show-ref-usage-string'Junio C Hamano2015-09-141-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | show-ref: place angle brackets around variables in usage stringah/show-ref-usage-stringAlex Henrie2015-08-311-1/+1
* | | | | | | | | Merge branch 'rt/help-strings-fix'Junio C Hamano2015-09-143-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | tag, update-ref: improve description of option "create-reflog"rt/help-strings-fixRalf Thielow2015-09-112-2/+2
| * | | | | | | | | pull: don't mark values for option "rebase" for translationRalf Thielow2015-09-111-1/+1
* | | | | | | | | | Merge branch 'gb/apply-comment-typofix'Junio C Hamano2015-09-141-1/+1
* | | | | | | | | | Sync with 2.5.2Junio C Hamano2015-09-091-2/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Sync with 2.4.9Junio C Hamano2015-09-041-2/+4
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Sync with 2.3.9Junio C Hamano2015-09-041-2/+4
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Sync with 2.2.3Junio C Hamano2015-09-041-2/+4
| | | |\ \ \ \ \ \
| | | | * | | | | | show-branch: use a strbuf for reflog descriptionsJeff King2015-09-041-2/+4
| * | | | | | | | | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd...Junio C Hamano2015-09-031-3/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/calloc-pathspec' into maintJunio C Hamano2015-09-032-2/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rev-list-has-no-notes' into maintJunio C Hamano2015-09-031-0/+3
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/get-remote-group-fix' into maintJunio C Hamano2015-09-031-8/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jc/builtin-am-signoff-regression-fix'Junio C Hamano2015-09-081-2/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | am: match --signoff to the original scripted versionjc/builtin-am-signoff-regression-fixJunio C Hamano2015-09-061-2/+29
* | | | | | | | | | | | | | Merge branch 'jk/am-rerere-lock-fix'Junio C Hamano2015-09-032-14/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | rerere: release lockfile in non-writing functionsjk/am-rerere-lock-fixJeff King2015-09-012-14/+9
* | | | | | | | | | | | | | | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd...Junio C Hamano2015-09-011-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | commit: don't rewrite shared index unnecessarilydt/commit-preserve-base-index-upon-opportunistic-cache-tree-updateDavid Turner2015-08-311-3/+1
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'jk/guess-repo-name-regression-fix' into maintJunio C Hamano2015-08-251-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ah/reflog-typofix-in-error'Junio C Hamano2015-09-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | reflog: add missing single quote to error messageah/reflog-typofix-in-errorAlex Henrie2015-08-281-1/+1
* | | | | | | | | | | | | | | | Merge branch 'ah/read-tree-usage-string'Junio C Hamano2015-09-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | read-tree: replace bracket set with parentheses to clarify usageah/read-tree-usage-stringAlex Henrie2015-08-281-1/+1
* | | | | | | | | | | | | | | | | Merge branch 'ah/pack-objects-usage-strings'Junio C Hamano2015-09-011-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | pack-objects: place angle brackets around placeholders in usage stringsah/pack-objects-usage-stringsAlex Henrie2015-08-281-2/+2
* | | | | | | | | | | | | | | | | Merge branch 'sg/describe-contains'Junio C Hamano2015-08-311-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | describe --contains: default to HEAD when no commit-ish is givensg/describe-containsSZEDER Gábor2015-08-251-4/+4
* | | | | | | | | | | | | | | | | | Merge branch 'db/push-sign-if-asked'Junio C Hamano2015-08-312-106/+128
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | push: add a config option push.gpgSign for default signed pushesdb/push-sign-if-askedDave Borowitz2015-08-192-15/+62
| * | | | | | | | | | | | | | | | | | push: support signing pushes iff the server supports itDave Borowitz2015-08-192-3/+23