From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Mon, 27 Nov 2023 16:23:20 +0000 (+0100)
Subject: git_reset
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=fb30fcd0a350eec06b626e53e4b5907576f5d577;p=nb.git

git_reset
---

diff --git a/etc/profile.d/git.sh b/etc/profile.d/git.sh
index b70d6138..753026c4 100644
--- a/etc/profile.d/git.sh
+++ b/etc/profile.d/git.sh
@@ -127,6 +127,10 @@ git_new_branch() {
 }
 
 git_pull_reset() {
+	git pull origin --rebase
+}
+
+git_pull_reset_branch() {
 	local branch=$(git branch --list|awk '/\*/{print $2; exit}')
 	[ -n "$1" ] && branch="$1"
 	[ -z "$branch" ] && return