brandon/oam
1
0
Fork 0
mirror of https://gitea.com/mcereda/oam.git synced 2026-02-09 05:44:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(git): reset fork to upstream state

Browse Source
This commit is contained in:
Michele Cereda
2024-10-15 19:36:47 +02:00
parent 6e015bcd57
commit 6944091022
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
knowledge base/git.md
View File

@@ -357,6 +357,13 @@ git show :/cool
# Skip commit hooks. # Skip commit hooks.
# Most useful with a broken `pre-commit` or `lefthook` executable or config. # Most useful with a broken `pre-commit` or `lefthook` executable or config.
git commit --no-verify … git commit --no-verify …
# Reset fork to upstream's state
git remote add 'upstream' '/url/to/original/repo'
git fetch 'upstream'
git checkout 'master'
git reset --hard 'upstream/master'
git push 'origin' 'master' --force
``` ```
## Authentication ## Authentication
@@ -1028,6 +1035,7 @@ git -c http.sslVerify=false …
- [Dress up your git diffs with word-level highlights] - [Dress up your git diffs with word-level highlights]
- [Git global config for specific repositories?] - [Git global config for specific repositories?]
- [cheat.sh] - [cheat.sh]
- [Clean up a fork and restart it from the upstream]
<!-- <!--
Reference Reference
@@ -1052,6 +1060,7 @@ git -c http.sslVerify=false …
[able to push to all git remotes with the one command?]: https://stackoverflow.com/questions/5785549/able-to-push-to-all-git-remotes-with-the-one-command [able to push to all git remotes with the one command?]: https://stackoverflow.com/questions/5785549/able-to-push-to-all-git-remotes-with-the-one-command
[cannot clone git from azure devops using pat]: https://stackoverflow.com/questions/53106546/cannot-clone-git-from-azure-devops-using-pat#53182981 [cannot clone git from azure devops using pat]: https://stackoverflow.com/questions/53106546/cannot-clone-git-from-azure-devops-using-pat#53182981
[cheat.sh]: https://cheat.sh/git [cheat.sh]: https://cheat.sh/git
[clean up a fork and restart it from the upstream]: https://stackoverflow.com/questions/9646167/clean-up-a-fork-and-restart-it-from-the-upstream#9646323
[coloring white space in git-diff's output]: https://stackoverflow.com/questions/5257553/coloring-white-space-in-git-diffs-output#5259137 [coloring white space in git-diff's output]: https://stackoverflow.com/questions/5257553/coloring-white-space-in-git-diffs-output#5259137
[create a git patch from the uncommitted changes in the current working directory]: https://stackoverflow.com/questions/5159185/create-a-git-patch-from-the-uncommitted-changes-in-the-current-working-directory [create a git patch from the uncommitted changes in the current working directory]: https://stackoverflow.com/questions/5159185/create-a-git-patch-from-the-uncommitted-changes-in-the-current-working-directory
[dress up your git diffs with word-level highlights]: https://www.viget.com/articles/dress-up-your-git-diffs-with-word-level-highlights/ [dress up your git diffs with word-level highlights]: https://www.viget.com/articles/dress-up-your-git-diffs-with-word-level-highlights/

7
snippets/git.sh
View File

@@ -102,3 +102,10 @@ git-all () {
[[ -n $DEBUG ]] && set +o xtrace [[ -n $DEBUG ]] && set +o xtrace
} }
# Reset fork to upstream's state
git remote add 'upstream' '/url/to/original/repo'
git fetch 'upstream'
git checkout 'master'
git reset --hard 'upstream/master'
git push 'origin' 'master' --force