Merge branch 'master' into patch-1

Author: gluons

src/aliases.ps1

@@ -31,6 +31,9 @@ function gb {
 function gba {
 	git branch -a $args
 }
+function gbd {
+	git branch -d $args
+}
 function gbda {
 	$MainBranch = Get-Git-MainBranch
 	$MergedBranchs = $(git branch --merged | Select-String "^(\*|\s*($MainBranch|develop|dev)\s*$)" -NotMatch).Line
@@ -133,6 +136,9 @@ function gcs {
 function gd {
 	git diff $args
 }
+function gds {
+	git diff --staged $args
+}
 function gdca {
 	git diff --cached $args
 }
@@ -254,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
 }
@@ -299,12 +314,20 @@ function grhh {
 function grmv {
 	git remote rename $args
 }
+function groh {
+	$CurrentBranch = Get-Git-CurrentBranch
+
+	git reset origin/$CurrentBranch --hard
+}
 function grrm {
 	git remote remove $args
 }
 function grs {
 	git restore $args
 }
+function grst {
+	git restore --staged $args
+}
 function grset {
 	git remote set-url $args
 }
@@ -388,9 +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 {
@@ -419,3 +448,11 @@ function ggp {
 
 	git push origin $CurrentBranch
 }
+function ggpnp {
+	ggl; ggp $args
+}
+function gprom {
+	$MainBranch = Get-Git-MainBranch
+
+	git pull --rebase origin $MainBranch $args
+}

src/git-aliases.psd1

@@ -12,7 +12,7 @@
 RootModule = 'git-aliases.psm1'
 
 # Version number of this module.
-ModuleVersion = '0.3.5'
+ModuleVersion = '0.3.6'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()

src/git-aliases.psm1

@@ -11,6 +11,7 @@ $FunctionsToExport = @(
 	'gau',
 	'gb',
 	'gba',
+	'gbd',
 	'gbda',
 	'gbl',
 	'gbnm',
@@ -42,6 +43,7 @@ $FunctionsToExport = @(
 	'gcpc',
 	'gcs',
 	'gd',
+	'gds',
 	'gdca',
 	'gdt',
 	'gdw',
@@ -78,7 +80,10 @@ $FunctionsToExport = @(
 	'gpf',
 	'gpf!',
 	'gpoat',
+	'gpr',
+	'gpra',
 	'gpristine',
+	'gprv',
 	'gpu',
 	'gpv',
 	'gr',
@@ -92,9 +97,11 @@ $FunctionsToExport = @(
 	'grh',
 	'grhh',
 	'grmv',
+	'groh',
 	'grrm',
 	'grset',
 	'grs',
+	'grst',
 	'grt',
 	'gru',
 	'grup',
@@ -120,13 +127,16 @@ $FunctionsToExport = @(
 	'gunignore',
 	'gunwip',
 	'gup',
+	'gupa',
 	'gupv',
 	'glum',
 	'gvt',
 	'gwch',
 	'gwip',
 	'ggl',
-	'ggp'
+	'ggp',
+	'ggpnp',
+	'gprom'
 )
 
 Export-ModuleMember -Function $FunctionsToExport

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
+}