Commit message (Expand) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'ab/test-lib' into nextnext | Junio C Hamano | 2021-10-29 | -1/+0 |
|\ | ||||
| * | t5310: drop lib-bundle.sh include | Jeff King | 2021-10-29 | -1/+0 |
* | | Merge branch 'jc/fix-ref-sorting-parse' into next | Junio C Hamano | 2021-10-29 | -52/+95 |
|\ \ | ||||
| * | | for-each-ref: delay parsing of --sort=<atom> options | Junio C Hamano | 2021-10-20 | -52/+95 |
| * | | Merge branch 'ab/ref-filter-leakfix' into jc/fix-ref-sorting-parse | Junio C Hamano | 2021-10-20 | -16/+34 |
| |\ \ | ||||
* | \ \ | Merge branch 'jc/fix-pull-ff-only-when-already-up-to-date' into next | Junio C Hamano | 2021-10-29 | -2/+43 |
|\ \ \ \ | ||||
| * | | | | pull: --ff-only should make it a noop when already-up-to-date | Junio C Hamano | 2021-10-29 | -2/+43 |
* | | | | | Merge branch 'so/stash-staged' into next | Junio C Hamano | 2021-10-29 | -3/+3 |
|\ \ \ \ \ | ||||
| * | | | | | stash: get rid of unused argument in stash_staged() | Sergey Organov | 2021-10-28 | -3/+3 |
* | | | | | | Merge branch 'jc/tutorial-format-patch-base' into next | Junio C Hamano | 2021-10-29 | -13/+28 |
|\ \ \ \ \ \ | ||||
| * | | | | | | MyFirstContribution: teach to use "format-patch --base=auto" | Junio C Hamano | 2021-10-23 | -13/+28 |
| | |/ / / / | |/| | | | | ||||
* | | | | | | Merge branch 'ab/refs-errno-cleanup' into next | Junio C Hamano | 2021-10-29 | -143/+294 |
|\ \ \ \ \ \ | ||||
| * | | | | | | refs API: post-migration API renaming [2/2] | Ævar Arnfjörð Bjarmason | 2021-10-16 | -29/+22 |
| * | | | | | | refs API: post-migration API renaming [1/2] | Ævar Arnfjörð Bjarmason | 2021-10-16 | -27/+15 |
| * | | | | | | refs API: don't expose "errno" in run_transaction_hook() | Ævar Arnfjörð Bjarmason | 2021-10-16 | -1/+4 |
| * | | | | | | refs API: make expand_ref() & repo_dwim_log() not set errno | Ævar Arnfjörð Bjarmason | 2021-10-16 | -5/+10 |
| * | | | | | | refs API: make resolve_ref_unsafe() not set errno | Ævar Arnfjörð Bjarmason | 2021-10-16 | -4/+12 |
| * | | | | | | refs API: make refs_ref_exists() not set errno | Ævar Arnfjörð Bjarmason | 2021-10-16 | -1/+3 |
| * | | | | | | refs API: make refs_resolve_refdup() not set errno | Ævar Arnfjörð Bjarmason | 2021-10-16 | -2/+3 |
| * | | | | | | refs tests: ignore ignore errno in test-ref-store helper | Ævar Arnfjörð Bjarmason | 2021-10-16 | -2/+3 |
| * | | | | | | refs API: ignore errno in worktree.c's find_shared_symref() | Ævar Arnfjörð Bjarmason | 2021-10-16 | -2/+4 |
| * | | | | | | refs API: ignore errno in worktree.c's add_head_info() | Ævar Arnfjörð Bjarmason | 2021-10-16 | -2/+4 |
| * | | | | | | refs API: make files_copy_or_rename_ref() et al not set errno | Ævar Arnfjörð Bjarmason | 2021-10-16 | -4/+6 |
| * | | | | | | refs API: make loose_fill_ref_dir() not set errno | Ævar Arnfjörð Bjarmason | 2021-10-16 | -2/+3 |
| * | | | | | | refs API: make resolve_gitlink_ref() not set errno | Ævar Arnfjörð Bjarmason | 2021-10-16 | -2/+3 |
| * | | | | | | refs API: remove refs_read_ref_full() wrapper | Ævar Arnfjörð Bjarmason | 2021-10-16 | -31/+36 |
| * | | | | | | refs/files: remove "name exist?" check in lock_ref_oid_basic() | Ævar Arnfjörð Bjarmason | 2021-10-16 | -24/+24 |
| * | | | | | | reflog tests: add --updateref tests | Ævar Arnfjörð Bjarmason | 2021-10-16 | -0/+65 |
| * | | | | | | refs API: make refs_rename_ref_available() static | Ævar Arnfjörð Bjarmason | 2021-10-16 | -33/+29 |
| * | | | | | | refs API: make parse_loose_ref_contents() not set errno | Han-Wen Nienhuys | 2021-10-16 | -16/+29 |
| * | | | | | | refs API: make refs_read_raw_ref() not set errno | Han-Wen Nienhuys | 2021-10-16 | -18/+29 |
| * | | | | | | refs API: add a version of refs_resolve_ref_unsafe() with "errno" | Ævar Arnfjörð Bjarmason | 2021-10-16 | -9/+39 |
| * | | | | | | branch tests: test for errno propagating on failing read | Han-Wen Nienhuys | 2021-10-16 | -0/+22 |
* | | | | | | | Merge branch 'ow/stash-count-in-status-porcelain-output' into next | Junio C Hamano | 2021-10-29 | -2/+46 |
|\ \ \ \ \ \ \ | ||||
| * | | | | | | | status: print stash info with --porcelain=v2 --show-stash | Øystein Walle | 2021-10-21 | -0/+38 |
| * | | | | | | | status: count stash entries in separate function | Øystein Walle | 2021-10-21 | -2/+8 |
| | |_|_|/ / / | |/| | | | | | ||||
* | | | | | | | Merge branch 'ab/unbundle-progress' into next | Junio C Hamano | 2021-10-27 | -4/+4 |
|\ \ \ \ \ \ \ | ||||
| * | | | | | | | git-bundle.txt: add missing words and punctuation | Martin Ågren | 2021-10-27 | -4/+4 |
* | | | | | | | | Merge branch 'jc/branch-copy-doc' into next | Junio C Hamano | 2021-10-27 | -2/+2 |
|\ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | branch (doc): -m/-c copies config and reflog | Junio C Hamano | 2021-10-23 | -2/+2 |
| | |_|_|/ / / / | |/| | | | | | | ||||
* | | | | | | | | Merge branch 'jc/doc-format-patch-clarify-auto-base' into next | Junio C Hamano | 2021-10-27 | -3/+3 |
|\ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | format-patch (doc): clarify --base=auto | Junio C Hamano | 2021-10-23 | -3/+3 |
| |/ / / / / / / | ||||
* | | | | | | | | Merge branch 'ma/doc-folder-to-directory' into next | Junio C Hamano | 2021-10-27 | -5/+5 |
|\ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | gitweb.txt: change "folder" to "directory" | Martin Ågren | 2021-10-25 | -1/+1 |
| * | | | | | | | | gitignore.txt: change "folder" to "directory" | Martin Ågren | 2021-10-25 | -1/+1 |
| * | | | | | | | | git-multi-pack-index.txt: change "folder" to "directory" | Martin Ågren | 2021-10-25 | -3/+3 |
| | |_|/ / / / / | |/| | | | | | | ||||
* | | | | | | | | Merge branch 'sg/sparse-index-not-that-common-a-command' into next | Junio C Hamano | 2021-10-27 | -1/+1 |
|\ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | command-list.txt: remove 'sparse-index' from main help | SZEDER Gábor | 2021-10-25 | -1/+1 |
| | |/ / / / / / | |/| | | | | | | ||||
* | | | | | | | | Merge branch 'ks/submodule-add-message-fix' into next | Junio C Hamano | 2021-10-27 | -3/+2 |
|\ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | submodule: drop unused sm_name parameter from append_fetch_remotes() | Jeff King | 2021-10-27 | -3/+2 |