summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/builtin-add-i'Junio C Hamano2019-12-051-0/+12
|\
| * Start to implement a built-in version of `git add --interactive`Johannes Schindelin2019-11-141-0/+12
* | Merge branch 'ds/test-read-graph'Junio C Hamano2019-12-011-68/+0
|\ \
| * | test-tool: use 'read-graph' helperDerrick Stolee2019-11-131-68/+0
* | | Merge branch 'jt/fetch-remove-lazy-fetch-plugging'Junio C Hamano2019-12-012-6/+2
|\ \ \
| * | | clone: remove fetch_if_missing=0Jonathan Tan2019-11-131-3/+0
| * | | fetch: remove fetch_if_missing=0Jonathan Tan2019-11-081-3/+2
| | |/ | |/|
* | | Merge branch 'tg/stash-refresh-index'Junio C Hamano2019-12-011-4/+3
|\ \ \
| * | | stash: make sure we have a valid index before writing itThomas Gummerer2019-11-141-4/+3
* | | | Merge branch 'rj/bundle-ui-updates'Junio C Hamano2019-12-011-45/+172
|\ \ \ \
| * | | | bundle-verify: add --quietRobin H. Johnson2019-11-111-3/+6
| * | | | bundle-create: progress output controlRobin H. Johnson2019-11-111-3/+27
| * | | | bundle: framework for options before bundle fileRobin H. Johnson2019-11-111-45/+145
| | |_|/ | |/| |
* | | | Merge branch 'en/doc-typofix'Junio C Hamano2019-12-013-4/+4
|\ \ \ \
| * | | | Fix spelling errors in code commentsElijah Newren2019-11-103-4/+4
* | | | | Merge branch 'js/fetch-multi-lockfix'Junio C Hamano2019-12-011-2/+8
|\ \ \ \ \
| * | | | | fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraphJohannes Schindelin2019-11-061-1/+2
| * | | | | fetch: add the command-line option `--write-commit-graph`Johannes Schindelin2019-11-061-1/+6
| | |_|_|/ | |/| | |
* | | | | Merge branch 'rt/fetch-message-fix'Junio C Hamano2019-12-011-1/+1
|\ \ \ \ \
| * | | | | fetch.c: fix typo in a warning messageRalf Thielow2019-11-021-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'pb/no-recursive-reset-hard-in-worktree-add'Junio C Hamano2019-12-011-1/+1
|\ \ \ \ \
| * | | | | worktree: teach "add" to ignore submodule.recurse configPhilippe Blain2019-10-301-1/+1
* | | | | | Merge branch 'sg/blame-indent-heuristics-is-now-the-default'Junio C Hamano2019-12-011-8/+0
|\ \ \ \ \ \
| * | | | | | builtin/blame.c: remove '--indent-heuristic' from usage stringSZEDER Gábor2019-10-291-8/+0
| |/ / / / /
* | | | | | Merge branch 'mr/clone-dir-exists-to-path-exists'Junio C Hamano2019-12-011-4/+4
|\ \ \ \ \ \
| * | | | | | clone: rename static function `dir_exists()`.Miriam Rubio2019-10-291-4/+4
| |/ / / / /
* | | | | | Merge branch 'jk/cleanup-object-parsing-and-fsck'Junio C Hamano2019-12-011-71/+55
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | fsck: only provide oid/type in fsck_error callbackJeff King2019-10-281-7/+10
| * | | | | fsck: don't require object structs for display functionsJeff King2019-10-281-32/+37
| * | | | | fsck: use oids rather than objects for object_name APIJeff King2019-10-281-6/+6
| * | | | | fsck: unify object-name codeJeff King2019-10-281-37/+13
* | | | | | Merge branch 'bc/hash-independent-tests-part-6'Junio C Hamano2019-11-101-0/+11
|\ \ \ \ \ \
| * | | | | | rev-parse: add a --show-object-format optionbrian m. carlson2019-10-281-0/+11
* | | | | | | Merge branch 'js/update-index-ignore-removal-for-skip-worktree'Junio C Hamano2019-11-102-3/+8
|\ \ \ \ \ \ \
| * | | | | | | stash: handle staged changes in skip-worktree files correctlyJohannes Schindelin2019-11-021-2/+3
| * | | | | | | update-index: optionally leave skip-worktree entries aloneJohannes Schindelin2019-11-021-1/+5
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'sg/commit-graph-usage-fix'Junio C Hamano2019-11-101-1/+0
|\ \ \ \ \ \ \
| * | | | | | | builtin/commit-graph.c: remove subcommand-less usage stringSZEDER Gábor2019-10-281-1/+0
| |/ / / / / /
* | | | | | | Merge branch 'wb/midx-progress'Junio C Hamano2019-11-102-6/+14
|\ \ \ \ \ \ \
| * | | | | | | multi-pack-index: add [--[no-]progress] option.William Baker2019-10-231-5/+13
| * | | | | | | midx: add MIDX_PROGRESS flagWilliam Baker2019-10-232-5/+5
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'js/rebase-deprecate-preserve-merges'Junio C Hamano2019-11-101-3/+4
|\ \ \ \ \ \ \
| * | | | | | | rebase: hide --preserve-merges optionDenton Liu2019-10-211-3/+4
* | | | | | | | Merge branch 'hv/bitshift-constants-in-blame'Junio C Hamano2019-11-101-12/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin/blame.c: constants into bit shift formatHariom Verma2019-10-211-12/+12
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'dd/notes-copy-default-dst-to-head'Junio C Hamano2019-11-101-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | notes: fix minimum number of parameters to "copy" subcommandDoan Tran Cong Danh2019-10-181-1/+1
* | | | | | | | | Merge branch 'pw/post-commit-from-sequencer'Junio C Hamano2019-11-101-22/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | move run_commit_hook() to libgit and use it therePhillip Wood2019-10-161-22/+0
* | | | | | | | | | Merge branch 'dl/format-patch-cover-from-desc'Junio C Hamano2019-11-101-33/+92
|\ \ \ \ \ \ \ \ \ \