Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ds/bundle-uri-clone' into ds/bundle-uri-3 | Junio C Hamano | 2022-08-25 | 1 | -0/+19 |
|\ | |||||
| * | clone: warn on failure to repo_init() | Derrick Stolee | 2022-08-24 | 1 | -2/+3 |
| * | clone: --bundle-uri cannot be combined with --depth | Derrick Stolee | 2022-08-10 | 1 | -0/+3 |
| * | clone: add --bundle-uri option | Derrick Stolee | 2022-08-10 | 1 | -0/+15 |
* | | Merge branch 'll/disk-usage-humanise' | Junio C Hamano | 2022-08-18 | 1 | -4/+32 |
|\ \ | |||||
| * | | rev-list: support human-readable output for `--disk-usage` | Li Linchao | 2022-08-11 | 1 | -4/+32 |
* | | | Merge branch 'sy/sparse-rm' | Junio C Hamano | 2022-08-18 | 2 | -85/+6 |
|\ \ \ | |||||
| * | | | rm: integrate with sparse-index | Shaoxuan Yuan | 2022-08-08 | 1 | -0/+2 |
| * | | | rm: expand the index only when necessary | Shaoxuan Yuan | 2022-08-08 | 1 | -2/+3 |
| * | | | pathspec.h: move pathspec_needs_expanded_index() from reset.c to here | Shaoxuan Yuan | 2022-08-08 | 1 | -83/+1 |
| * | | | Merge branch 'vd/sparse-reset-checkout-fixes' into sy/sparse-rm | Junio C Hamano | 2022-08-08 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |/| | | |||||
* | | | | Merge branch 'vd/sparse-reset-checkout-fixes' | Junio C Hamano | 2022-08-18 | 1 | -0/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | checkout: fix nested sparse directory diff in sparse index | Victoria Dye | 2022-08-08 | 1 | -0/+1 |
* | | | | Merge branch 'ab/tech-docs-to-help' | Junio C Hamano | 2022-08-15 | 1 | -1/+19 |
|\ \ \ \ | |||||
| * | | | | git docs: add a category for file formats, protocols and interfaces | Ævar Arnfjörð Bjarmason | 2022-08-04 | 1 | -0/+9 |
| * | | | | git docs: add a category for user-facing file, repo and command UX | Ævar Arnfjörð Bjarmason | 2022-08-04 | 1 | -0/+9 |
| * | | | | git help doc: use "<doc>" instead of "<guide>" | Ævar Arnfjörð Bjarmason | 2022-08-04 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'ab/plug-revisions-leak' | Junio C Hamano | 2022-08-12 | 2 | -11/+25 |
|\ \ \ \ | |||||
| * | | | | revisions API: don't leak memory on argv elements that need free()-ing | Ævar Arnfjörð Bjarmason | 2022-08-03 | 1 | -1/+4 |
| * | | | | log: refactor "rev.pending" code in cmd_show() | Ævar Arnfjörð Bjarmason | 2022-08-03 | 1 | -10/+15 |
| * | | | | log: fix a memory leak in "git show <revision>..." | Ævar Arnfjörð Bjarmason | 2022-08-03 | 1 | -0/+6 |
* | | | | | Merge branch 'lt/symbolic-ref-sanity' | Junio C Hamano | 2022-08-12 | 1 | -0/+2 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | symbolic-ref: refuse to set syntactically invalid target | Linus Torvalds | 2022-08-01 | 1 | -0/+2 |
| | |_|/ | |/| | | |||||
| * | | | Merge branch 'ro/mktree-allow-missing-fix' into maint | Junio C Hamano | 2022-07-27 | 1 | -2/+9 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jk/diff-files-cleanup-fix' into maint | Junio C Hamano | 2022-07-27 | 1 | -1/+1 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'tb/cat-file-z' | Junio C Hamano | 2022-08-06 | 1 | -3/+25 |
|\ \ \ \ \ \ | |||||
| * | | | | | | builtin/cat-file.c: support NUL-delimited input with `-z` | Taylor Blau | 2022-07-23 | 1 | -3/+25 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'jc/string-list-cleanup' | Junio C Hamano | 2022-08-03 | 1 | -2/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | builtin/remote.c: use the right kind of STRING_LIST_INIT | Junio C Hamano | 2022-07-21 | 1 | -2/+1 |
* | | | | | | | Merge branch 'en/merge-restore-to-pristine' | Junio C Hamano | 2022-08-03 | 1 | -14/+43 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | merge: do not exit restore_state() prematurely | Elijah Newren | 2022-07-23 | 1 | -4/+6 |
| * | | | | | | | merge: ensure we can actually restore pre-merge state | Elijah Newren | 2022-07-23 | 1 | -5/+5 |
| * | | | | | | | merge: make restore_state() restore staged state too | Elijah Newren | 2022-07-23 | 1 | -3/+5 |
| * | | | | | | | merge: fix save_state() to work when there are stat-dirty files | Elijah Newren | 2022-07-23 | 1 | -0/+8 |
| * | | | | | | | merge: do not abort early if one strategy fails to handle the merge | Elijah Newren | 2022-07-23 | 1 | -2/+4 |
| * | | | | | | | merge: abort if index does not match HEAD for trivial merges | Elijah Newren | 2022-07-23 | 1 | -0/+15 |
* | | | | | | | | Merge branch 'sa/cat-file-mailmap' | Junio C Hamano | 2022-08-03 | 1 | -1/+42 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | cat-file: add mailmap support | Siddharth Asthana | 2022-07-18 | 1 | -1/+42 |
* | | | | | | | | | Merge branch 'zh/ls-files-format' | Junio C Hamano | 2022-08-03 | 1 | -0/+95 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | ls-files: introduce "--format" option | ZheNing Hu | 2022-07-23 | 1 | -0/+95 |
* | | | | | | | | | Merge branch 'mt/checkout-count-fix' | Junio C Hamano | 2022-08-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | checkout: fix two bugs on the final count of updated entries | Matheus Tavares | 2022-07-14 | 1 | -1/+1 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'ds/rebase-update-ref' | Junio C Hamano | 2022-08-01 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | rebase: add rebase.updateRefs config option | Derrick Stolee | 2022-07-19 | 1 | -0/+5 |
| * | | | | | | | | rebase: add --update-refs option | Derrick Stolee | 2022-07-19 | 1 | -0/+5 |
| * | | | | | | | | Merge branch 'ds/branch-checked-out' into ds/rebase-update-ref | Junio C Hamano | 2022-07-12 | 2 | -37/+20 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'js/shortlog-sort-stably' | Junio C Hamano | 2022-07-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | / / / | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | shortlog: use a stable sort | Johannes Schindelin | 2022-07-14 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jk/diff-files-cleanup-fix' | Junio C Hamano | 2022-07-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | diff-files: move misplaced cleanup label | Jeff King | 2022-07-12 | 1 | -1/+1 |