Difference between revisions of "Git rebase"
Jump to navigation
Jump to search
| (4 intermediate revisions by the same user not shown) | |||
| Line 5: | Line 5: | ||
| − | *<code>[[git config | + | * <code>[[git config pull.rebase]] false </code> # merge (the default strategy) |
| − | *<code>git config pull.rebase true </code> # rebase | + | * <code>git config pull.rebase true </code> # rebase |
| + | == Related == | ||
| + | * [[crane rebase]] | ||
| + | * [[Fatal: Need to specify how to reconcile divergent branches.]] | ||
== See also == | == See also == | ||
| − | * {{ | + | * {{git config}} |
[[Category:Git]] | [[Category:Git]] | ||
Latest revision as of 10:11, 3 February 2025
git config pull.rebase false# merge (the default strategy)git config pull.rebase true# rebase
Related[edit]
See also[edit]
Advertising:
