summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/misc-fixes' into maintJunio C Hamano2015-11-051-1/+1
|\
| * Correct fscanf formatting string for I64u valuesjs/misc-fixesWaldek Maleska2015-10-261-1/+1
* | Merge branch 'jc/add-u-A-default-to-top' into maintJunio C Hamano2015-11-051-7/+1
|\ \
| * | add: simplify -u/-A without pathspecjc/add-u-A-default-to-topJunio C Hamano2015-10-241-7/+1
* | | Merge branch 'nd/clone-linked-checkout' into maintJunio C Hamano2015-11-051-3/+10
|\ \ \
| * | | clone: better error when --reference is a linked checkoutnd/clone-linked-checkoutNguyễn Thái Ngọc Duy2015-09-281-1/+6
| * | | clone: allow --local from a linked checkoutNguyễn Thái Ngọc Duy2015-09-281-2/+4
* | | | Merge branch 'es/worktree-add' into maintJunio C Hamano2015-11-041-1/+1
|\ \ \ \
| * | | | worktree: usage: denote <branch> as optional with 'add'es/worktree-addSidhant Sharma2015-10-181-1/+1
* | | | | Merge branch 'mk/blame-error-message' into maintJunio C Hamano2015-11-031-1/+1
|\ \ \ \ \
| * | | | | blame: fix option name in error messagemk/blame-error-messageMax Kirillov2015-10-261-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jk/merge-file-exit-code' into maintJunio C Hamano2015-11-031-0/+3
|\ \ \ \ \
| * | | | | merge-file: clamp exit code to maximum 127jk/merge-file-exit-codeJeff King2015-10-291-0/+3
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jc/am-3-fallback-regression-fix' into maintJunio C Hamano2015-11-031-16/+33
|\ \ \ \ \
| * | | | | am -3: do not let failed merge from completing the error codepathjc/am-3-fallback-regression-fixJunio C Hamano2015-10-091-16/+33
* | | | | | Merge branch 'jc/usage-stdin' into maintJunio C Hamano2015-11-0311-12/+12
|\ \ \ \ \ \
| * | | | | | usage: do not insist that standard input must come from a filejc/usage-stdinJunio C Hamano2015-10-1611-12/+12
* | | | | | | Merge branch 'rt/placeholder-in-usage' into maintJunio C Hamano2015-11-031-2/+2
|\ \ \ \ \ \ \
| * | | | | | | am, credential-cache: add angle brackets to usage stringrt/placeholder-in-usageRalf Thielow2015-10-161-2/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'nd/gc-auto-background-fix' into maintJunio C Hamano2015-11-031-1/+55
|\ \ \ \ \ \ \
| * | | | | | | gc: save log from daemonized gc --auto and print it next timend/gc-auto-background-fixNguyễn Thái Ngọc Duy2015-09-211-1/+55
* | | | | | | | Merge branch 'js/clone-dissociate' into maintJunio C Hamano2015-11-031-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | clone --dissociate: avoid locking pack filesjs/clone-dissociateJohannes Schindelin2015-10-071-1/+3
* | | | | | | | | Merge branch 'tk/stripspace' into maintJunio C Hamano2015-11-037-102/+42
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | stripspace: use parse-options for command-line parsingtk/stripspaceTobias Klauser2015-10-161-26/+31
| * | | | | | | | | strbuf: make stripspace() part of strbufTobias Klauser2015-10-167-77/+12
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | / / / / / / / / / / / | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
View Lorry Controller Status