Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |/ / / / | |||||
* | | | | | Merge branch 'ab/gc-log-rephrase' into maint | Junio C Hamano | 2021-10-12 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | gc: remove trailing dot from "gc.log" line | Ævar Arnfjörð Bjarmason | 2021-09-02 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'rs/xopen-reports-open-failures' into maint | Junio C Hamano | 2021-10-12 | 11 | -37/+12 |
|\ \ \ \ \ | |||||
| * | | | | | use xopen() to handle fatal open(2) failures | René Scharfe | 2021-08-25 | 11 | -37/+12 |
| |/ / / / | |||||
* | | | | | Merge branch 'js/maintenance-launchctl-fix' into maint | Junio C Hamano | 2021-10-12 | 1 | -21/+70 |
|\ \ \ \ \ | |||||
| * | | | | | maintenance: skip bootout/bootstrap when plist is registered | Derrick Stolee | 2021-08-24 | 1 | -9/+45 |
| * | | | | | maintenance: create `launchctl` configuration using a lock file | Johannes Schindelin | 2021-08-24 | 1 | -17/+30 |
| |/ / / / | |||||
* | | | | | Merge branch 'ab/rebase-fatal-fatal-fix' into maint | Junio C Hamano | 2021-10-12 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | rebase: emit one "fatal" in "fatal: fatal: <error>" | Ævar Arnfjörð Bjarmason | 2021-08-24 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'ab/ls-remote-packet-trace' into maint | Junio C Hamano | 2021-10-12 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | ls-remote: set packet_trace_identity(<name>) | Ævar Arnfjörð Bjarmason | 2021-08-24 | 1 | -0/+2 |
| |/ / / / | |||||
* | | | | | Merge branch 'cb/builtin-merge-format-string-fix' into maint | Junio C Hamano | 2021-10-12 | 1 | -3/+5 |
|\ \ \ \ \ | |||||
| * | | | | | builtin/merge: avoid -Wformat-extra-args from ancient Xcode | Carlo Marcelo Arenas Belón | 2021-08-09 | 1 | -3/+5 |
* | | | | | | Merge branch 'en/merge-strategy-docs' into maint | Junio C Hamano | 2021-10-12 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Update error message and code comment | Elijah Newren | 2021-08-05 | 1 | -1/+1 |
* | | | | | | Merge branch 'rs/use-fspathhash' | Junio C Hamano | 2021-08-04 | 1 | -8/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | use fspathhash() everywhere | René Scharfe | 2021-07-30 | 1 | -8/+2 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'pb/merge-autostash-more' | Junio C Hamano | 2021-08-04 | 1 | -1/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | merge: apply autostash if merge strategy fails | Philippe Blain | 2021-07-24 | 1 | -0/+1 |
| * | | | | | | merge: apply autostash if fast-forward fails | Philippe Blain | 2021-07-24 | 1 | -0/+1 |
| * | | | | | | merge: add missing word "strategy" to a message | Philippe Blain | 2021-07-24 | 1 | -1/+1 |
* | | | | | | | Merge branch 'ds/commit-and-checkout-with-sparse-index' | Junio C Hamano | 2021-08-04 | 2 | -5/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | checkout: stop expanding sparse indexes | Derrick Stolee | 2021-07-15 | 1 | -5/+3 |
| * | | | | | | | commit: integrate with sparse-index | Derrick Stolee | 2021-07-15 | 1 | -0/+3 |