aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* allow hooks to ignore their standard input streamClemens Buchacher2015-11-16
* Merge branch 'js/misc-fixes' into maintJunio C Hamano2015-11-05
|\
| * Correct fscanf formatting string for I64u valuesWaldek Maleska2015-10-26
* | Merge branch 'jc/add-u-A-default-to-top' into maintJunio C Hamano2015-11-05
|\ \
| * | add: simplify -u/-A without pathspecJunio C Hamano2015-10-24
* | | Merge branch 'nd/clone-linked-checkout' into maintJunio C Hamano2015-11-05
|\ \ \
| * | | clone: better error when --reference is a linked checkoutNguyễn Thái Ngọc Duy2015-09-28
| * | | clone: allow --local from a linked checkoutNguyễn Thái Ngọc Duy2015-09-28
* | | | Merge branch 'es/worktree-add' into maintJunio C Hamano2015-11-04
|\ \ \ \
| * | | | worktree: usage: denote <branch> as optional with 'add'Sidhant Sharma2015-10-18
* | | | | Merge branch 'mk/blame-error-message' into maintJunio C Hamano2015-11-03
|\ \ \ \ \
| * | | | | blame: fix option name in error messageMax Kirillov2015-10-26
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jk/merge-file-exit-code' into maintJunio C Hamano2015-11-03
|\ \ \ \ \
| * | | | | merge-file: clamp exit code to maximum 127Jeff King2015-10-29
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jc/am-3-fallback-regression-fix' into maintJunio C Hamano2015-11-03
|\ \ \ \ \
| * | | | | am -3: do not let failed merge from completing the error codepathJunio C Hamano2015-10-09
* | | | | | Merge branch 'jc/usage-stdin' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \
| * | | | | | usage: do not insist that standard input must come from a fileJunio C Hamano2015-10-16
* | | | | | | Merge branch 'rt/placeholder-in-usage' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \
| * | | | | | | am, credential-cache: add angle brackets to usage stringRalf Thielow2015-10-16
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'nd/gc-auto-background-fix' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \
| * | | | | | | gc: save log from daemonized gc --auto and print it next timeNguyễn Thái Ngọc Duy2015-09-21
* | | | | | | | Merge branch 'js/clone-dissociate' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \
| * | | | | | | | clone --dissociate: avoid locking pack filesJohannes Schindelin2015-10-07
* | | | | | | | | Merge branch 'tk/stripspace' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | stripspace: use parse-options for command-line parsingTobias Klauser2015-10-16
| * | | | | | | | | strbuf: make stripspace() part of strbufTobias Klauser2015-10-16
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/repository-extension' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | introduce "preciousObjects" repository extensionJeff King2015-06-24
* | | | | | | | | Merge branch 'nd/ls-remote-does-not-have-u-option' into maintJunio C Hamano2015-10-16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ls-remote.txt: delete unsupported optionNguyễn Thái Ngọc Duy2015-09-28
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/fsck-dropped-errors' into maintJunio C Hamano2015-10-16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fsck: exit with non-zero when problems are foundJunio C Hamano2015-09-23
* | | | | | | | | | Merge branch 'pt/am-builtin' into maintJunio C Hamano2015-10-16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | am: configure gpg at startupRenee Margaret McConahy2015-09-30
* | | | | | | | | | | Merge branch 'jk/blame-first-parent' into maintJunio C Hamano2015-10-16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | blame: handle --first-parentJeff King2015-09-16
* | | | | | | | | | | | Merge branch 'pt/pull-builtin' into maintJunio C Hamano2015-10-16
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | pull: enclose <options> in brackets in the usage stringAlex Henrie2015-10-16
* | | | | | | | | | | | Sync with v2.5.4Junio C Hamano2015-09-28
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Sync with 2.4.10Junio C Hamano2015-09-28
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Sync with 2.3.10Junio C Hamano2015-09-28
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | merge-file: enforce MAX_XDIFF_SIZE on incoming filesJeff King2015-09-28
| | | * | | | | | | | | | react to errors in xdi_diffJeff King2015-09-28
| | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
* | | | | | | | | | | | Merge branch 'ah/show-ref-usage-string'Junio C Hamano2015-09-14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | show-ref: place angle brackets around variables in usage stringAlex Henrie2015-08-31
* | | | | | | | | | | | | Merge branch 'rt/help-strings-fix'Junio C Hamano2015-09-14
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | tag, update-ref: improve description of option "create-reflog"Ralf Thielow2015-09-11
| * | | | | | | | | | | | | pull: don't mark values for option "rebase" for translationRalf Thielow2015-09-11
* | | | | | | | | | | | | | Merge branch 'gb/apply-comment-typofix'Junio C Hamano2015-09-14