summaryrefslogtreecommitdiffstats
path: root/builtin (follow)
Commit message (Expand)AuthorAgeFilesLines
* rebase: teach rebase --keep-baseDenton Liu2019-08-281-6/+26
* rebase: fast-forward --fork-point in more casesDenton Liu2019-08-281-3/+7
* rebase: fast-forward --onto in more casesDenton Liu2019-08-281-8/+19
* rebase: refactor can_fast_forward into goto towerDenton Liu2019-08-281-8/+13
* Merge branch 'sg/worktree-remove-errormsg'Junio C Hamano2019-08-221-1/+1
|\
| * worktree remove: clarify error message on dirty worktreeSZEDER Gábor2019-08-131-1/+1
* | Merge branch 'sg/commit-graph-validate'Junio C Hamano2019-08-222-5/+7
|\ \
| * | commit-graph: error out on invalid commit oids in 'write --stdin-commits'SZEDER Gábor2019-08-051-1/+3
| * | commit-graph: turn a group of write-related macro flags into an enumSZEDER Gábor2019-08-052-4/+4
* | | Merge branch 'vn/restore-empty-ita-corner-case-fix'Junio C Hamano2019-08-221-0/+1
|\ \ \
| * | | checkout.c: unstage empty deleted ita filesVarun Naik2019-08-021-0/+1
* | | | Merge branch 'jk/tree-walk-overflow'Junio C Hamano2019-08-221-2/+3
|\ \ \ \
| * | | | tree-walk: add a strbuf wrapper for make_traverse_path()Jeff King2019-08-011-2/+3
| * | | | tree-walk: accept a raw length for traverse_path_len()Jeff King2019-08-011-1/+1
| * | | | tree-walk: drop oid from traverse_infoJeff King2019-07-311-1/+1
| * | | | setup_traverse_info(): stop copying oidJeff King2019-07-311-1/+1
* | | | | Merge branch 'mt/grep-submodules-working-tree'Junio C Hamano2019-08-221-4/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | grep: fix worktree case in submodulesMatheus Tavares2019-07-301-4/+6
| |/ / /
| * | | Merge branch 'fc/fetch-with-import-fix' into maintJunio C Hamano2019-07-291-10/+18
| |\ \ \
| * \ \ \ Merge branch 'ds/close-object-store' into maintJunio C Hamano2019-07-2910-24/+28
| |\ \ \ \
| * \ \ \ \ Merge branch 'rs/avoid-overflow-in-midpoint-computation' into maintJunio C Hamano2019-07-291-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/trailers-use-config' into maintJunio C Hamano2019-07-291-0/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'tg/stash-ref-by-index-fix' into maintJunio C Hamano2019-07-291-4/+5
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'pw/rebase-abort-clean-rewritten' into maintJunio C Hamano2019-07-291-10/+29
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/delta-islands-progress-fix' into maintJunio C Hamano2019-07-291-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ms/submodule-foreach-fix' into maintJunio C Hamano2019-07-291-0/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'js/rebase-reschedule-applies-only-to-interactive' into maintJunio C Hamano2019-07-291-3/+7
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/denoise-rm-to-resolve' into maintJunio C Hamano2019-07-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/clean-report-too-long-a-path' into maintJunio C Hamano2019-07-291-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'po/doc-branch' into maintJunio C Hamano2019-07-291-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/bisect-helper-check-get-oid-return-value' into maintJunio C Hamano2019-07-251-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jt/partial-clone-missing-ref-delta-base' into maintJunio C Hamano2019-07-251-2/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'xl/record-partial-clone-origin' into maintJunio C Hamano2019-07-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/fsmonitor-unflake' into maintJunio C Hamano2019-07-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'vv/merge-squash-with-explicit-commit' into maintJunio C Hamano2019-07-251-1/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/am-i-resolved-fix' into maintJunio C Hamano2019-07-251-11/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/init-relative-template-fix' into maintJunio C Hamano2019-07-251-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | l10n: reformat some localized strings for v2.23.0Jean-Noël Avila2019-08-062-5/+12
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/log-mailmap-flip-defaults'Junio C Hamano2019-08-021-19/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | log: really flip the --mailmap defaultJunio C Hamano2019-08-021-5/+2
| * | | | | | | | | | | | | | | | | | | | | log: flip the --mailmap default unconditionallyJunio C Hamano2019-08-011-15/+1
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/repack-silence-auto-bitmap-warning'Junio C Hamano2019-08-012-22/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | repack: simplify handling of auto-bitmaps and .keep filesJeff King2019-07-311-15/+2
| * | | | | | | | | | | | | | | | | | | | | repack: silence warnings when auto-enabled bitmaps cannot be builtJeff King2019-07-312-11/+25
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/no-system-includes-in-dot-c'Junio C Hamano2019-07-312-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | verify-tag: drop signal.h includeJeff King2019-06-192-2/+0
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'js/rebase-cleanup'Junio C Hamano2019-07-291-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | git: mark cmd_rebase as requiring a worktreeJohannes Schindelin2019-07-251-4/+0
| * | | | | | | | | | | | | | | | | | | | | rebase: fix white-spaceJohannes Schindelin2019-07-251-1/+1
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/denoise-rm-to-resolve'Junio C Hamano2019-07-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |