+
Skip to content

Add -u short option for git pull #2037

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −1
Open

Add -u short option for git pull #2037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion builtin/pull.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ static struct option pull_options[] = {
0),
OPT_BOOL(0, "show-forced-updates", &opt_show_forced_updates,
N_("check for forced-updates on all updated branches")),
OPT_PASSTHRU(0, "set-upstream", &set_upstream, NULL,
OPT_PASSTHRU('u', "set-upstream", &set_upstream, NULL,
N_("set upstream for git pull/fetch"),
PARSE_OPT_NOARG),

Expand Down
7 changes: 7 additions & 0 deletions t/t5553-set-upstream.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,13 @@ test_expect_success 'pull --set-upstream upstream main sets branch main but not
check_config_missing other
'

test_expect_success 'pull -u upstream main sets branch main but not other' '
clear_config main other &&
git pull --no-rebase -u upstream main &&
check_config main upstream refs/heads/main &&
check_config_missing other
'

test_expect_success 'pull --set-upstream main:other2 does not set the branch other2' '
clear_config other2 &&
git pull --no-rebase --set-upstream upstream main:other2 &&
Expand Down
Loading
点击 这是indexloc提供的php浏览器服务，不要输入任何密码和下载