commit 4c9687cab572a50068445b3441498bd7afb9bd67 parent b2135c64927b50483e1775049413a5a82ab1f5ca Author: Alex Balgavy <alex@balgavy.eu> Date: Sat, 19 Jun 2021 22:38:17 +0200 git: remove pull-menu, not as useful as I thought it would be Diffstat:
| M | git/gitconfig | | | 2 | +- |
| D | scripts/git-pull-menu | | | 16 | ---------------- |
2 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/git/gitconfig b/git/gitconfig @@ -60,7 +60,7 @@ delete-merged = "!git checkout master && git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d && git fetch --all --prune" p = push pushf = push --force-with-lease - pf = "!git-pull-menu" + pf = pull --ff-only fuckit = reset --hard HEAD fuckitall = reset --hard origin/master ssh = "!git remote get-url origin | sed -E 's|^https?://([^/]+)/(.+)|git@\\1:\\2|' | tr -d '\n'" diff --git a/scripts/git-pull-menu b/scripts/git-pull-menu @@ -1,16 +0,0 @@ -#!/usr/bin/env bash -if ! command -v git &> /dev/null; then echo "git not found" && exit 1; fi -git fetch --all -if ! git pull --ff-only; then - select action in "Rebase" "Merge"; do - upstream="$(git branch -r | grep -v HEAD | tr -d ' ')" - case $action in - Rebase) - git pull --rebase "$upstream" - break;; - Merge) - git merge "$upstream" - break;; - esac - done -fi