From 3f6245124b908f8bbbe2961b09fd142fa5f2e40e Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Wed, 24 Jan 2024 08:55:47 -0500 Subject: [PATCH] xxtip: simplify --- dot_local/bin/executable_xxtip | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dot_local/bin/executable_xxtip b/dot_local/bin/executable_xxtip index 151cc6d..5508153 100644 --- a/dot_local/bin/executable_xxtip +++ b/dot_local/bin/executable_xxtip @@ -8,8 +8,5 @@ back_to_current_branch() { exit 1 } -git checkout master -git pull --rebase upstream master -git push -f -git checkout "$current_branch" -git rebase master +git fetch upstream master +git rebase upstream/master