Merge branch 'master' into master

Author: gluons

src/aliases.ps1

@@ -260,10 +260,19 @@ function gpoat {
 	git push origin --all
 	git push origin --tags
 }
+function gpr {
+	git pull --rebase $args
+}
+function gpra {
+	git pull --rebase --autostash $args
+}
 function gpristine {
 	git reset --hard
 	git clean -dfx
 }
+function gprv {
+	git pull --rebase -v $args
+}
 function gpu {
 	git push upstream $args
 }
@@ -402,12 +411,15 @@ function gunwip {
 	git reset HEAD~1
 }
 function gup {
+	Write-Host-Deprecated "gup" "gpr"
 	git pull --rebase $args
 }
 function gupa {
+	Write-Host-Deprecated "gupa" "gpra"
 	git pull --rebase --autostash $args
 }
 function gupv {
+	Write-Host-Deprecated "gupv" "gprv"
 	git pull --rebase -v $args
 }
 function glum {

src/git-aliases.psm1

@@ -80,7 +80,10 @@ $FunctionsToExport = @(
 	'gpf',
 	'gpf!',
 	'gpoat',
+	'gpr',
+	'gpra',
 	'gpristine',
+	'gprv',
 	'gpu',
 	'gpv',
 	'gr',

src/utils.ps1

@@ -133,3 +133,26 @@ function Get-Git-Aliases ([string] $Alias) {
 
 	return Format-Table -InputObject $aliases -AutoSize -Wrap -Property $cols
 }
+
+<#
+.SYNOPSIS
+	Print deprecated message.
+.DESCRIPTION
+	Print a colored message telling that a specific alias ($previous)
+	is deprecated, suggesting the use of another alias ($next).
+.EXAMPLE
+	PS C:\> Write-Host-Deprecated "gup" "gpr"
+	[git-aliases] gup is a deprecated alias, use "gpr" instead.
+#>
+function Write-Host-Deprecated {
+	param (
+		[Parameter(Mandatory = $true)][string] $previous,
+        [Parameter(Mandatory = $true)][string] $next
+	)
+
+    Write-Host "[git-aliases] " -ForegroundColor Yellow -NoNewLine
+    Write-Host "${previous}" -ForegroundColor Red -NoNewLine
+    Write-Host " is a deprecated alias, use " -ForegroundColor Yellow -NoNewLine
+    Write-Host """${next}""" -ForegroundColor Green -NoNewLine
+    Write-Host " instead.`n" -ForegroundColor Yellow
+}