extern/PowerShell
1
0
Fork 0
mirror of https://github.com/fleschutz/PowerShell.git synced 2024-11-08 00:54:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename to pick-commit.ps1

Browse Source
This commit is contained in:
Markus Fleschutz 2021-10-06 09:33:45 +02:00
parent fd84a498ac
commit e757322213
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Data/scripts.csv
View File

@ -36,7 +36,6 @@ check-symlinks.ps1, Checks every symlink in a directory tree
check-weather.ps1, Checks the current weather for critical values
check-windows-system-files.ps1, Checks the validity of the Windows system files
check-xml-file.ps1, Checks the given XML file for validity
cherry-picker.ps1, Cherry-picks a Git commit into multiple branches
clean-repo.ps1, Cleans the current/given Git repository from untracked files (including submodules)
clean-repos.ps1, Cleans all Git repositories under the current/given directory from untracked files (including submodules)
clear-recycle-bin.ps1, Removes the content of the recycle bin folder (can not be undo!)
@ -161,6 +160,7 @@ open-file-explorer.ps1, Starts the Microsoft File Explorer
open-netflix.ps1, Starts the Netflix app
open-onedrive.ps1, Opens the user's OneDrive folder
open-recycle-bin.ps1, Starts the File Explorer with the recycle bin folder
pick-commit.ps1, Cherry-picks a Git commit into multiple branches
play-beep.ps1, Plays a beep sound
play-files.ps1, Plays the given audio files
play-happy-birthday.ps1, Plays the Happy Birthday song

Can't render this file because it has a wrong number of fields in line 88.

8
README.md
View File

@ -197,13 +197,12 @@ Mega Collection of PowerShell Scripts
| ---------------------------------------------------- | ------------------------------------------------------------------ | --------------------------------------- |
| [build-repo.ps1](Scripts/build-repo.ps1) | Builds a Git repository | [Help](Docs/build-repo.md) |
| [build-repos.ps1](Scripts/build-repos.ps1) | Builds all Git repositories in a folder | [Help](Docs/build-repos.md) |
| [cherry-picker.ps1](Scripts/cherry-picker.ps1) | Cherry-picks a Git commit into multiple branches | [Help](Docs/cherry-picker.md) |
| [clean-repo.ps1](Scripts/clean-repo.ps1) | Cleans a Git repository from untracked files (including submodules) | [Help](Docs/clean-repo.md) |
| [clean-repos.ps1](Scripts/clean-repos.ps1) | Cleans all Git repositories under a directory from untracked files (including submodules) | [Help](Docs/clean-repos.md) |
| [clean-repos.ps1](Scripts/clean-repos.ps1) | Cleans all Git repositories in a folder from untracked files (including submodules) | [Help](Docs/clean-repos.md) |
| [clone-repos.ps1](Scripts/clone-repos.ps1) | Clones well-known Git repositories | [Help](Docs/clone-repos.md) |
| [configure-git.ps1](Scripts/configure-git.ps1) | Sets up the Git user configuration | [Help](Docs/configure-git.md) |
| [fetch-repo.ps1](Scripts/fetch-repo.ps1) | Fetches updates for a Git repository (including submodules) | [Help](Docs/fetch-repo.md) |
| [fetch-repos.ps1](Scripts/fetch-repos.ps1) | Fetches updates for all Git repositories under a directory (including submodules) | [Help](Docs/fetch-repos.md)|
| [fetch-repos.ps1](Scripts/fetch-repos.ps1) | Fetches updates for all Git repositories in a folder (including submodules) | [Help](Docs/fetch-repos.md)|
| [list-branches.ps1](Scripts/list-branches.ps1) | Lists all branches in a Git repository | [Help](Docs/list-branches.md) |
| [list-commits.ps1](Scripts/list-commits.ps1) | Lists all commits in a Git repository | [Help](Docs/list-commits.md) |
| [list-latest-tag.ps1](Scripts/list-latest-tag.ps1) | Lists the latest tag on the current branch in a Git repository | [Help](Docs/list-latest-tag.md) |
@ -212,8 +211,9 @@ Mega Collection of PowerShell Scripts
| [list-tags.ps1](Scripts/list-tags.ps1) | Lists all tags in a Git repository | [Help](Docs/list-tags.md) |
| [new-branch.ps1](Scripts/new-branch.ps1) | Creates a new branch in a Git repository | [Help](Docs/new-branch.md) |
| [new-tag.ps1](Scripts/new-tag.ps1) | Creates a new tag in a Git repository | [Help](Docs/new-tag.md) |
| [pick-commit.ps1](Scripts/pick-commit.ps1) | Cherry-picks a Git commit into multiple branches | [Help](Docs/pick-commit.md) |
| [pull-repo.ps1](Scripts/pull-repo.ps1) | Pulls updates for a Git repository (including submodules) | [Help](Docs/pull-repo.md) |
| [pull-repos.ps1](Scripts/pull-repos.ps1) | Pulls updates for all Git repositories under a directory (including submodules) | [Help](Docs/pull-repos.md)|
| [pull-repos.ps1](Scripts/pull-repos.ps1) | Pulls updates for all Git repositories in a folder (including submodules) | [Help](Docs/pull-repos.md)|
| [remove-tag.ps1](Scripts/remove-tag.ps1) | Removes a tag in a Git repository | [Help](Docs/remove-tag.md) |
| [switch-branch.ps1](Scripts/switch-branch.ps1) | Switches the branch in a Git repository (including submodules) | [Help](Docs/switch-branch.md) |
| [sync-repo.ps1](Scripts/sync-repo.ps1) | Synchronizes a Git repository by push & pull (including submodules) | [Help](Docs/sync-repo.md) |

4
Scripts/build-repos.ps1
View File

@ -2,7 +2,9 @@
.SYNOPSIS
Builds all Git repositories in a folder
.DESCRIPTION
make-repos.ps1 [<ParentDir>]
build-repos.ps1 [<ParentDir>]
.PARAMETER ParentDir
Specifies the path to the folder containing the Git repositories
.EXAMPLE
PS> ./build-repos C:\MyRepos
.NOTES

4
Scripts/cherry-picker.ps1 → Scripts/pick-commit.ps1
View File

@ -2,11 +2,11 @@
.SYNOPSIS
Cherry-picks a Git commit into one or more branches
.DESCRIPTION
cherry-picker.ps1 [<CommitID>] [<CommitMessage>] [<Branches>] [<RepoDir>]
pick-commit.ps1 [<CommitID>] [<CommitMessage>] [<Branches>] [<RepoDir>]
Cherry-picks a Git commit into one or more branches (branch names need to be separated by spaces)
NOTE: in case of merge conflicts the script stops immediately!
.EXAMPLE
PS> ./cherry-picker 93849f889 "Fix typo" "v1 v2 v3"
PS> ./pick-commit 93849f889 "Fix typo" "v1 v2 v3"
.NOTES
Author: Markus Fleschutz · License: CC0
.LINK