Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use a default "fetch" strategy #195

Merged
merged 4 commits into from
Apr 28, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
use pull.rebase from Git as the default "fetch"
amtoine committed Apr 27, 2024
commit 350661247bfd4fea7fe1d8bd1959e3607c9e463b
7 changes: 6 additions & 1 deletion pkgs/nu-git-manager-sugar/nu-git-manager-sugar/git/mod.nu
Original file line number Diff line number Diff line change
@@ -229,8 +229,13 @@ export def "gm repo remote add" [name: string, remote: string, --ssh]: nothing -
export def "gm repo branch fetch" [
remote: string@get-remotes, # the branch to fetch
branch: string@get-branches, # the remote to fetch the branch from
--strategy: string@get-strategies = "none" # the merge strategy to use
--strategy: string@get-strategies # the merge strategy to use, defaults to the `pull.rebase` Git
# config option
]: nothing -> nothing {
let strategy = $strategy | default (
if (^git config pull.rebase) == "true" { "rebase" } else { "merge" }
)

^git fetch $remote $branch

if (^git branch --list | lines | str substring 2.. | where $it == $branch | is-empty) {