summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jt/partial-clone-missing-ref-delta-base'Junio C Hamano2019-06-211-2/+24
|\
| * index-pack: prefetch missing REF_DELTA basesJonathan Tan2019-05-151-2/+24
* | Merge branch 'xl/record-partial-clone-origin'Junio C Hamano2019-06-171-1/+1
|\ \
| * | clone: respect user supplied origin name when setting up partial cloneXin Li2019-05-291-1/+1
* | | Merge branch 'js/fsmonitor-unflake'Junio C Hamano2019-06-171-1/+1
|\ \ \
| * | | fill_stat_cache_info(): prepare for an fsmonitor fixJohannes Schindelin2019-05-281-1/+1
* | | | Merge branch 'ba/clone-remote-submodules'Junio C Hamano2019-06-171-0/+8
|\ \ \ \
| * | | | clone: add `--remote-submodules` flagBen Avison2019-05-281-0/+8
| | |_|/ | |/| |
* | | | Merge branch 'vv/merge-squash-with-explicit-commit'Junio C Hamano2019-06-171-1/+11
|\ \ \ \
| * | | | merge: refuse --commit with --squashVishal Verma2019-05-281-1/+11
* | | | | Merge branch 'js/bisect-helper-check-get-oid-return-value'Junio C Hamano2019-06-171-1/+4
|\ \ \ \ \
| * | | | | bisect--helper: verify HEAD could be parsed before continuingJohannes Schindelin2019-05-281-1/+4
| |/ / / /
* | | | | Merge branch 'jk/am-i-resolved-fix'Junio C Hamano2019-06-171-11/+12
|\ \ \ \ \
| * | | | | am: fix --interactive HEAD tree resolutionJeff King2019-05-281-3/+4
| * | | | | am: drop tty requirement for --interactiveJeff King2019-05-281-3/+3
| * | | | | am: read interactive input from stdinJeff King2019-05-281-2/+4
| * | | | | am: simplify prompt response handlingJeff King2019-05-281-3/+1
| |/ / / /
* | | | | Merge branch 'dl/format-patch-notes-config'Junio C Hamano2019-06-131-1/+19
|\ \ \ \ \
| * | | | | format-patch: teach format.notes config optionDenton Liu2019-05-171-1/+19
* | | | | | Merge branch 'nd/merge-quit'Junio C Hamano2019-06-131-12/+18
|\ \ \ \ \ \
| * | | | | | merge: add --quitNguyễn Thái Ngọc Duy2019-05-191-0/+13
| * | | | | | merge: remove drop_save() in favor of remove_merge_branch_state()Nguyễn Thái Ngọc Duy2019-05-131-12/+5
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'js/rebase-cleanup'Junio C Hamano2019-06-131-6/+1
|\ \ \ \ \ \
| * | | | | | rebase: fold git-rebase--common into the -p backendJohannes Schindelin2019-05-151-2/+1
| * | | | | | Drop unused git-rebase--am.shJohannes Schindelin2019-05-151-4/+0
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'nd/worktree-name-sanitization'Junio C Hamano2019-06-131-1/+9
|\ \ \ \ \ \
| * | | | | | worktree add: sanitize worktree namesNguyễn Thái Ngọc Duy2019-05-151-1/+9
* | | | | | | Merge branch 'en/fast-export-encoding'Junio C Hamano2019-06-131-6/+49
|\ \ \ \ \ \ \
| * | | | | | | fast-export: do automatic reencoding of commit messages only if requestedElijah Newren2019-05-141-3/+43
| * | | | | | | fast-export: differentiate between explicitly UTF-8 and implicitly UTF-8Elijah Newren2019-05-141-1/+1
| * | | | | | | fast-export: avoid stripping encoding header if we cannot reencodeElijah Newren2019-05-141-2/+5
* | | | | | | | Merge branch 'jk/unused-params-final-batch'Junio C Hamano2019-06-1318-58/+44
|\ \ \ \ \ \ \ \
| * | | | | | | | verify-commit: simplify parameters to run_gpg_verify()Jeff King2019-05-131-15/+8
| * | | | | | | | show-branch: drop unused parameter from show_independent()Jeff King2019-05-131-2/+1
| * | | | | | | | rev-list: drop unused void pointer from finish_commit()Jeff King2019-05-131-5/+5
| * | | | | | | | remove_all_fetch_refspecs(): drop unused "remote" parameterJeff King2019-05-131-2/+2
| * | | | | | | | receive-pack: drop unused "commands" from prepare_shallow_update()Jeff King2019-05-131-3/+2
| * | | | | | | | pack-objects: drop unused rev_info parametersJeff King2019-05-131-4/+4
| * | | | | | | | name-rev: drop unused parameters from is_better_name()Jeff King2019-05-131-4/+1
| * | | | | | | | mktree: drop unused length parameterJeff King2019-05-131-2/+2
| * | | | | | | | clone: drop dest parameter from copy_alternates()Jeff King2019-05-131-3/+2
| * | | | | | | | submodule: drop unused prefix parameter from some functionsJeff King2019-05-132-5/+4
| * | | | | | | | builtin: consistently pass cmd_* prefix to parse_optionsJeff King2019-05-135-5/+5
| * | | | | | | | cmd_{read,write}_tree: rename "unused" variable that is usedJeff King2019-05-132-8/+8
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'sb/format-patch-base-patch-id-fix'Junio C Hamano2019-06-132-17/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | format-patch: make --base patch-id output stableStephen Boyd2019-05-082-17/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/init-relative-template-fix'Junio C Hamano2019-06-131-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | init: make --template path relative to $CWDNguyễn Thái Ngọc Duy2019-05-131-0/+3
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'js/rebase-config-bitfix'Junio C Hamano2019-05-301-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | rebase: replace incorrect logical negation by correct bitwise oneJohannes Schindelin2019-05-281-1/+1