Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'js/builtin-add-i' | Junio C Hamano | 2019-12-05 | 1 | -0/+12 |
|\ | |||||
| * | Start to implement a built-in version of `git add --interactive` | Johannes Schindelin | 2019-11-14 | 1 | -0/+12 |
* | | Merge branch 'ds/test-read-graph' | Junio C Hamano | 2019-12-01 | 1 | -68/+0 |
|\ \ | |||||
| * | | test-tool: use 'read-graph' helper | Derrick Stolee | 2019-11-13 | 1 | -68/+0 |
* | | | Merge branch 'jt/fetch-remove-lazy-fetch-plugging' | Junio C Hamano | 2019-12-01 | 2 | -6/+2 |
|\ \ \ | |||||
| * | | | clone: remove fetch_if_missing=0 | Jonathan Tan | 2019-11-13 | 1 | -3/+0 |
| * | | | fetch: remove fetch_if_missing=0 | Jonathan Tan | 2019-11-08 | 1 | -3/+2 |
| | |/ | |/| | |||||
* | | | Merge branch 'tg/stash-refresh-index' | Junio C Hamano | 2019-12-01 | 1 | -4/+3 |
|\ \ \ | |||||
| * | | | stash: make sure we have a valid index before writing it | Thomas Gummerer | 2019-11-14 | 1 | -4/+3 |
* | | | | Merge branch 'rj/bundle-ui-updates' | Junio C Hamano | 2019-12-01 | 1 | -45/+172 |
|\ \ \ \ | |||||
| * | | | | bundle-verify: add --quiet | Robin H. Johnson | 2019-11-11 | 1 | -3/+6 |
| * | | | | bundle-create: progress output control | Robin H. Johnson | 2019-11-11 | 1 | -3/+27 |
| * | | | | bundle: framework for options before bundle file | Robin H. Johnson | 2019-11-11 | 1 | -45/+145 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'en/doc-typofix' | Junio C Hamano | 2019-12-01 | 3 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | Fix spelling errors in code comments | Elijah Newren | 2019-11-10 | 3 | -4/+4 |
* | | | | | Merge branch 'js/fetch-multi-lockfix' | Junio C Hamano | 2019-12-01 | 1 | -2/+8 |
|\ \ \ \ \ | |||||
| * | | | | | fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph | Johannes Schindelin | 2019-11-06 | 1 | -1/+2 |
| * | | | | | fetch: add the command-line option `--write-commit-graph` | Johannes Schindelin | 2019-11-06 | 1 | -1/+6 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'rt/fetch-message-fix' | Junio C Hamano | 2019-12-01 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | fetch.c: fix typo in a warning message | Ralf Thielow | 2019-11-02 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'pb/no-recursive-reset-hard-in-worktree-add' | Junio C Hamano | 2019-12-01 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | worktree: teach "add" to ignore submodule.recurse config | Philippe Blain | 2019-10-30 | 1 | -1/+1 |
* | | | | | | Merge branch 'sg/blame-indent-heuristics-is-now-the-default' | Junio C Hamano | 2019-12-01 | 1 | -8/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | builtin/blame.c: remove '--indent-heuristic' from usage string | SZEDER Gábor | 2019-10-29 | 1 | -8/+0 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'mr/clone-dir-exists-to-path-exists' | Junio C Hamano | 2019-12-01 | 1 | -4/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | clone: rename static function `dir_exists()`. | Miriam Rubio | 2019-10-29 | 1 | -4/+4 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jk/cleanup-object-parsing-and-fsck' | Junio C Hamano | 2019-12-01 | 1 | -71/+55 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | fsck: only provide oid/type in fsck_error callback | Jeff King | 2019-10-28 | 1 | -7/+10 |
| * | | | | | fsck: don't require object structs for display functions | Jeff King | 2019-10-28 | 1 | -32/+37 |
| * | | | | | fsck: use oids rather than objects for object_name API | Jeff King | 2019-10-28 | 1 | -6/+6 |
| * | | | | | fsck: unify object-name code | Jeff King | 2019-10-28 | 1 | -37/+13 |
* | | | | | | Merge branch 'bc/hash-independent-tests-part-6' | Junio C Hamano | 2019-11-10 | 1 | -0/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rev-parse: add a --show-object-format option | brian m. carlson | 2019-10-28 | 1 | -0/+11 |
* | | | | | | | Merge branch 'js/update-index-ignore-removal-for-skip-worktree' | Junio C Hamano | 2019-11-10 | 2 | -3/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | stash: handle staged changes in skip-worktree files correctly | Johannes Schindelin | 2019-11-02 | 1 | -2/+3 |
| * | | | | | | | update-index: optionally leave skip-worktree entries alone | Johannes Schindelin | 2019-11-02 | 1 | -1/+5 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'sg/commit-graph-usage-fix' | Junio C Hamano | 2019-11-10 | 1 | -1/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | builtin/commit-graph.c: remove subcommand-less usage string | SZEDER Gábor | 2019-10-28 | 1 | -1/+0 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'wb/midx-progress' | Junio C Hamano | 2019-11-10 | 2 | -6/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | multi-pack-index: add [--[no-]progress] option. | William Baker | 2019-10-23 | 1 | -5/+13 |
| * | | | | | | | midx: add MIDX_PROGRESS flag | William Baker | 2019-10-23 | 2 | -5/+5 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'js/rebase-deprecate-preserve-merges' | Junio C Hamano | 2019-11-10 | 1 | -3/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rebase: hide --preserve-merges option | Denton Liu | 2019-10-21 | 1 | -3/+4 |
* | | | | | | | | Merge branch 'hv/bitshift-constants-in-blame' | Junio C Hamano | 2019-11-10 | 1 | -12/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | builtin/blame.c: constants into bit shift format | Hariom Verma | 2019-10-21 | 1 | -12/+12 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'dd/notes-copy-default-dst-to-head' | Junio C Hamano | 2019-11-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | notes: fix minimum number of parameters to "copy" subcommand | Doan Tran Cong Danh | 2019-10-18 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'pw/post-commit-from-sequencer' | Junio C Hamano | 2019-11-10 | 1 | -22/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | move run_commit_hook() to libgit and use it there | Phillip Wood | 2019-10-16 | 1 | -22/+0 |
* | | | | | | | | | | Merge branch 'dl/format-patch-cover-from-desc' | Junio C Hamano | 2019-11-10 | 1 | -33/+92 |
|\ \ \ \ \ \ \ \ \ \ |