summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* blame: require 0 context lines while finding moved lines with -Mks/blame-move-no-reason-for-1-line-contextdk/blame-move-no-reason-for-1-line-contextDavid Kastrup2016-05-291-4/+3
* 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
| * | | | | submodule--helper: move config-sanitizing to submodule.cJeff King2016-04-281-48/+0
* | | | | | Merge branch 'va/i18n-misc-updates'Junio C Hamano2016-05-174-14/+18
|\ \ \ \ \ \
| * | | | | | i18n: builtin/pull.c: split strings marked for translationVasco Almeida2016-04-191-4/+4
| * | | | | | i18n: builtin/pull.c: mark placeholders for translationVasco Almeida2016-04-191-3/+3
| * | | | | | i18n: branch: move comment for translatorsVasco Almeida2016-04-131-2/+4
| * | | | | | i18n: branch: unmark string for translationVasco Almeida2016-04-131-2/+2
| * | | | | | i18n: builtin/rm.c: remove a comma ',' from stringVasco Almeida2016-04-121-1/+1
| * | | | | | i18n: builtin/branch.c: mark option for translationVasco Almeida2016-04-081-1/+1
| * | | | | | i18n: index-pack: use plural string instead of normal oneVasco Almeida2016-04-081-1/+3
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'lp/typofixes'Junio C Hamano2016-05-171-1/+1
|\ \ \ \ \ \
| * | | | | | typofix: assorted typofixes in comments, documentation and messageslp/typofixesLi Peng2016-05-061-1/+1
| |/ / / / /
* | | | | | Merge branch 'sb/submodule-init'Junio C Hamano2016-05-171-14/+353
|\ \ \ \ \ \
| * | | | | | submodule init: redirect stdout to stderrStefan Beller2016-05-031-1/+2
| * | | | | | submodule--helper update-clone: abort gracefully on missing .gitmodulesStefan Beller2016-04-291-13/+25
| * | | | | | submodule init: fail gracefully with a missing .gitmodules fileStefan Beller2016-04-291-3/+7
| * | | | | | submodule: port init from shell to CStefan Beller2016-04-161-0/+115
| * | | | | | submodule: port resolve_relative_url from shell to CStefan Beller2016-04-161-1/+208
| * | | | | | Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-initJunio C Hamano2016-04-1455-706/+689
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Merge branch 'sb/submodule-helper-clone-regression-fix' into sb/submodule-initJunio C Hamano2016-04-141-23/+18
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'jc/commit-tree-ignore-commit-gpgsign'Junio C Hamano2016-05-131-4/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | commit-tree: do not pay attention to commit.gpgsignjc/commit-tree-ignore-commit-gpgsignJunio C Hamano2016-05-031-4/+0
| | |_|_|_|_|_|/ | |/| | | | | |