Merge branch 'main' into feature/git-remove-local-branches

Author: alokedesai

specs/git/reset_local_branch_to_match_remote_branch.yaml

@@ -1,13 +1,16 @@
 ---
 name: Reset local branch to match remote branch
-command: "git fetch origin\ngit reset --hard {{branch}}"
+command: "git fetch {{remote}}\ngit reset --hard {{remote}}/{{branch}}"
 tags:
   - git
 description: Resets a local branch to match a remote branch by pulling the most recent changes from the remote branch and then force resetting the local branch to match the remote branch.
 arguments:
+  - name: remote
+    description: The name of the remote
+    default_value: origin
   - name: branch
     description: The name of the remote branch that the local branch should be reset to
-    default_value: origin/master
+    default_value: master
 source_url: "https://stackoverflow.com/questions/1628088/reset-local-repository-branch-to-be-just-like-remote-repository-head"
 author: Dan Moulding
 author_url: "https://stackoverflow.com/users/95706/dan-moulding"

specs/git/update_git_index_after_ignoring_files.yaml

@@ -0,0 +1,21 @@
+---
+# The name of the workflow.
+name: Delete newly git-ignored files from your repository
+# The corresponding command for the workflow. Any arguments should be surrounded with two curly braces. E.g `command {{arg}}`.
+command: |-
+  git rm -r --cached .
+  git add .
+# Any tags that the workflow should be categorized with.
+tags:
+  - git
+# A description of the workflow.
+description: After adding new files to the .gitignore file, these commands will update the git index
+# The source URL for where the workflow was generated from, if any.
+source_url: "https://stackoverflow.com/questions/1274057/how-can-i-make-git-forget-about-a-file-that-was-tracked-but-is-now-in-gitign"
+# The author of the workflow.
+author: Matt Frear
+# The URL of original author of the Workflow. For example, if this workflow was generated from StackOverflow, the `author_url` would be the StackOverflow author's profile page.
+author_url: "https://stackoverflow.com/users/32598/matt-frear"
+# The valid shells where this workflow should be active. If valid for all shells, this can be left empty.
+# See FORMAT.md for the full list of accepted values.
+shells: []