Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Sync with 2.32.4 | Taylor Blau | 2022-10-06 | 1 | -3/+5 |
|\ | |||||
| * | Sync with 2.31.5 | Taylor Blau | 2022-10-06 | 1 | -3/+5 |
| |\ | |||||
| | * | Sync with 2.30.6 | Taylor Blau | 2022-10-06 | 1 | -3/+5 |
| | |\ | |||||
| | | * | builtin/clone.c: disallow `--local` clones with symlinks | Taylor Blau | 2022-10-01 | 1 | -3/+5 |
* | | | | Merge branch 'da/difftool-dir-diff-symlink-fix' into maint | Junio C Hamano | 2021-10-12 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | difftool: fix symlink-file writing in dir-diff mode | David Aguilar | 2021-09-23 | 1 | -0/+2 |
| |/ / / | |||||
* | | | | Merge branch 'jk/clone-unborn-head-in-bare' into maint | Junio C Hamano | 2021-10-12 | 1 | -16/+17 |
|\ \ \ \ | |||||
| * | | | | clone: handle unborn branch in bare repos | Jeff King | 2021-09-20 | 1 | -16/+17 |
* | | | | | Merge branch 'en/stash-df-fix' into maint | Junio C Hamano | 2021-10-12 | 1 | -3/+17 |
|\ \ \ \ \ | |||||
| * | | | | | stash: restore untracked files AFTER restoring tracked files | Elijah Newren | 2021-09-11 | 1 | -3/+3 |
| * | | | | | stash: avoid feeding directories to update-index | Elijah Newren | 2021-09-11 | 1 | -0/+14 |
| |/ / / / | |||||
* | | | | | Merge branch 'en/am-abort-fix' into maint | Junio C Hamano | 2021-10-12 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | am: fix incorrect exit status on am fail to abort | Elijah Newren | 2021-09-11 | 1 | -1/+2 |
| |/ / / / | |||||
* | | | | | Merge branch 'ps/update-ref-batch-flush' into maint | Junio C Hamano | 2021-10-12 | 1 | -4/+10 |
|\ \ \ \ \ | |||||
| * | | | | | update-ref: fix streaming of status updates | Patrick Steinhardt | 2021-09-03 | 1 | -4/+10 |
| |/ / / / | |||||
* | | | | | Merge branch 'tb/pack-finalize-ordering' into maint | Junio C Hamano | 2021-10-12 | 3 | -30/+35 |
|\ \ \ \ \ | |||||
| * | | | | | pack-objects: rename .idx files into place after .bitmap files | Ævar Arnfjörð Bjarmason | 2021-09-10 | 1 | -1/+2 |
| * | | | | | pack-write: split up finish_tmp_packfile() function | Ævar Arnfjörð Bjarmason | 2021-09-10 | 1 | -2/+5 |
| * | | | | | builtin/index-pack.c: move `.idx` files into place last | Taylor Blau | 2021-09-10 | 1 | -2/+2 |
| * | | | | | index-pack: refactor renaming in final() | Ævar Arnfjörð Bjarmason | 2021-09-10 | 1 | -25/+23 |
| * | | | | | builtin/repack.c: move `.idx` files into place last | Taylor Blau | 2021-09-10 | 1 | -1/+1 |
| * | | | | | pack-write: refactor renaming in finish_tmp_packfile() | Ævar Arnfjörð Bjarmason | 2021-09-10 | 1 | -2/+5 |
| |/ / / / | |||||
* | | | | | Merge branch 'so/diff-index-regression-fix' into maint | Junio C Hamano | 2021-10-12 | 1 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | diff-index: restore -c/--cc options handling | Sergey Organov | 2021-09-07 | 1 | -3/+3 |
| |/ / / / | |||||
* | | | | | Merge branch 'tk/fast-export-anonymized-tag-fix' into maint | Junio C Hamano | 2021-10-12 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | fast-export: fix anonymized tag using original length | Tal Kelrich | 2021-08-31 | 1 | -0/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'sg/column-nl' into maint | Junio C Hamano | 2021-10-12 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | column: fix parsing of the '--nl' option | SZEDER Gábor | 2021-08-26 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'rs/branch-allow-deleting-dangling' into maint | Junio C Hamano | 2021-10-12 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | branch: allow deleting dangling branches with --force | René Scharfe | 2021-08-28 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'mt/quiet-with-delayed-checkout' into maint | Junio C Hamano | 2021-10-12 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | checkout: make delayed checkout respect --quiet and --no-progress | Matheus Tavares | 2021-08-27 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'jk/commit-edit-fixup-fix' into maint | Junio C Hamano | 2021-10-12 | 1 | -2/+3 |
|\ \ \ \ \ | |||||
| * | | | | | commit: restore --edit when combined with --fixup | Joel Klinghed | 2021-08-15 | 1 | -2/+3 |
| |/ / / / | |||||
* | | | | | Merge branch 'en/pull-conflicting-options' into maint | Junio C Hamano | 2021-10-12 | 2 | -12/+45 |
|\ \ \ \ \ | |||||
| * | | | | | pull: fix handling of multiple heads | Elijah Newren | 2021-07-22 | 1 | -4/+14 |
| * | | | | | pull: update docs & code for option compatibility with rebasing | Elijah Newren | 2021-07-22 | 1 | -0/+2 |
| * | | | | | pull: abort by default when fast-forwarding is not possible | Elijah Newren | 2021-07-22 | 1 | -4/+6 |
| * | | | | | pull: make --rebase and --no-rebase override pull.ff=only | Elijah Newren | 2021-07-22 | 1 | -1/+15 |
| * | | | | | pull: since --ff-only overrides, handle it first | Elijah Newren | 2021-07-22 | 1 | -8/+8 |
| * | | | | | pull: abort if --ff-only is given and fast-forwarding is impossible | Alex Henrie | 2021-07-21 | 2 | -4/+9 |
* | | | | | | Merge branch 'jt/push-negotiation-fixes' into maint | Junio C Hamano | 2021-10-12 | 2 | -1/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fetch: die on invalid --negotiation-tip hash | Jonathan Tan | 2021-07-15 | 1 | -1/+3 |
| * | | | | | | send-pack: fix push.negotiate with remote helper | Jonathan Tan | 2021-07-15 | 1 | -0/+1 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'ab/pack-stdin-packs-fix' into maint | Junio C Hamano | 2021-10-12 | 1 | -3/+20 |
|\ \ \ \ \ \ | |||||
| * | | | | | | pack-objects: fix segfault in --stdin-packs option | Ævar Arnfjörð Bjarmason | 2021-07-09 | 1 | -3/+20 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jc/prefix-filename-allocates' into maint | Junio C Hamano | 2021-10-12 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | hash-object: prefix_filename() returns allocated memory these days | Junio C Hamano | 2021-09-08 | 1 | -1/+1 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'rs/show-branch-simplify' into maint | Junio C Hamano | 2021-10-12 | 1 | -10/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | show-branch: simplify rev_is_head() | René Scharfe | 2021-08-27 | 1 | -10/+5 |
| |/ / / / / |