summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/rev-list-count-with-bitmap'Junio C Hamano2016-06-201-1/+5
|\
| * rev-list: disable bitmaps when "-n" is used with listing objectsjk/rev-list-count-with-bitmapJeff King2016-06-031-1/+2
| * rev-list: "adjust" results of "--count --use-bitmap-index -n"Jeff King2016-06-031-0/+3
* | Merge branch 'jc/clear-pathspec'Junio C Hamano2016-06-203-5/+5
|\ \
| * | pathspec: rename free_pathspec() to clear_pathspec()jc/clear-pathspecJunio C Hamano2016-06-023-5/+5
* | | Merge branch 'jg/dash-is-last-branch-in-worktree-add'Junio C Hamano2016-06-201-0/+3
|\ \ \
| * | | worktree: allow "-" short-hand for @{-1} in add commandjg/dash-is-last-branch-in-worktree-addJordan DE GEA2016-05-311-0/+3
* | | | Merge branch 'sb/submodule-recommend-shallowness'Junio C Hamano2016-06-201-1/+6
|\ \ \ \
| * | | | submodule update: learn `--[no-]recommend-shallow` optionStefan Beller2016-05-271-1/+6
| |/ / /
* | | | Merge branch 'ah/no-verify-signature-with-pull-rebase'Junio C Hamano2016-06-201-0/+3
|\ \ \ \
| * | | | pull: warn on --verify-signatures with --rebaseah/no-verify-signature-with-pull-rebaseAlexander Hirsch2016-05-201-0/+3
* | | | | Merge branch 'sb/submodule-helper-relative-path'Junio C Hamano2016-06-061-0/+12
|\ \ \ \ \
| * | | | | submodule: remove bashism from shell scriptsb/submodule-helper-relative-pathStefan Beller2016-06-011-0/+12
* | | | | | Merge branch 'sb/submodule-helper-list-signal-unmatch-via-exit-status'Junio C Hamano2016-06-061-3/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | submodule--helper: offer a consistent APIsb/submodule-helper-list-signal-unmatch-via-exit-statusStefan Beller2016-06-011-3/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs/apply-name-terminate'Junio C Hamano2016-06-031-2/+2
|\ \ \ \ \
| * | | | | apply: remove unused parameters from name_terminate()rs/apply-name-terminateRené Scharfe2016-05-291-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'rs/patch-id-use-skip-prefix'Junio C Hamano2016-06-031-13/+10
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | patch-id: use starts_with() and skip_prefix()rs/patch-id-use-skip-prefixRené Scharfe2016-05-291-13/+10
| |/ / /
* | | | Merge branch 'jk/cat-file-buffered-batch-all'Junio C Hamano2016-05-311-1/+20
|\ \ \ \ | |_|_|/ |/| | |
| * | | cat-file: default to --buffer when --batch-all-objects is usedjk/cat-file-buffered-batch-allJeff King2016-05-181-0/+4
| * | | cat-file: avoid noop calls to sha1_object_info_extendedJeff King2016-05-181-1/+16
* | | | Merge branch 'ar/diff-args-osx-precompose'Junio C Hamano2016-05-234-0/+5
|\ \ \ \
| * | | | diff: run arguments through precompose_argvar/diff-args-osx-precomposeAlexander Rinass2016-05-134-0/+5
| | |/ / | |/| |
* | | | Merge branch 'pb/commit-verbose-config'Junio C Hamano2016-05-231-0/+10
|\ \ \ \
| * | | | commit: add a commit.verbose config variablepb/commit-verbose-configPranit Bauva2016-05-101-0/+10
* | | | | Merge branch 'xy/format-patch-base'Junio C Hamano2016-05-231-0/+168
|\ \ \ \ \
| * | | | | format-patch: introduce format.useAutoBase configurationXiaolong Ye2016-04-261-6/+11
| * | | | | format-patch: introduce --base=auto optionXiaolong Ye2016-04-261-3/+27
| * | | | | format-patch: add '--base' option to record base tree infoXiaolong Ye2016-04-261-0/+139
* | | | | | Merge branch 'nd/worktree-various-heads'Junio C Hamano2016-05-234-11/+36
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | branch: do not rename a branch under bisect or rebasend/worktree-various-headsNguyễn Thái Ngọc Duy2016-04-221-0/+25
| * | | | | worktree.c: check whether branch is rebased in another worktreeNguyễn Thái Ngọc Duy2016-04-222-3/+3
| * | | | | worktree.c: make find_shared_symref() return struct worktree *Nguyễn Thái Ngọc Duy2016-04-222-8/+8
* | | | | | Merge branch 'va/i18n-remote-comment-to-align'Junio C Hamano2016-05-171-0/+2
|\ \ \ \ \ \
| * | | | | | i18n: remote: add comment for translatorsva/i18n-remote-comment-to-alignVasco Almeida2016-05-091-0/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'nd/error-errno'Junio C Hamano2016-05-1711-33/+28
|\ \ \ \ \ \
| * | | | | | builtin/worktree.c: use error_errno()Nguyễn Thái Ngọc Duy2016-05-091-1/+1
| * | | | | | builtin/upload-archive.c: use error_errno()Nguyễn Thái Ngọc Duy2016-05-091-2/+1
| * | | | | | builtin/update-index.c: prefer "err" to "errno" in process_lstat_errorNguyễn Thái Ngọc Duy2016-05-091-1/+1
| * | | | | | builtin/rm.c: use warning_errno()Nguyễn Thái Ngọc Duy2016-05-091-1/+1
| * | | | | | builtin/pack-objects.c: use die_errno() and warning_errno()Nguyễn Thái Ngọc Duy2016-05-091-4/+2
| * | | | | | builtin/merge-file.c: use error_errno()Nguyễn Thái Ngọc Duy2016-05-091-5/+5
| * | | | | | builtin/mailsplit.c: use error_errno()Nguyễn Thái Ngọc Duy2016-05-091-5/+5
| * | | | | | builtin/help.c: use warning_errno()Nguyễn Thái Ngọc Duy2016-05-091-4/+4
| * | | | | | builtin/fetch.c: use error_errno()Nguyễn Thái Ngọc Duy2016-05-091-2/+2
| * | | | | | builtin/branch.c: use error_errno()Nguyễn Thái Ngọc Duy2016-05-091-2/+1
| * | | | | | builtin/am.c: use error_errno()Nguyễn Thái Ngọc Duy2016-05-091-6/+5
| |/ / / / /
* | | | | | Merge branch 'jk/submodule-c-credential'Junio C Hamano2016-05-171-65/+0
|\ \ \ \ \ \
| * | | | | | submodule: stop sanitizing config optionsjk/submodule-c-credentialJeff King2016-05-061-17/+0
View Lorry Controller Status