GIT references for commands - vishwanathj/technical GitHub Wiki

Deleting a branch --> https://www.git-tower.com/learn/git/faq/delete-remote-branch

Keeping a fork updated -->

• https://thoughtbot.com/blog/keeping-a-github-fork-updated
• https://github.com/KirstieJane/STEMMRoleModels/wiki/Syncing-your-fork-to-the-original-repository-via-the-browser

https://blog.scottlowe.org/2015/01/27/using-fork-branch-git-workflow/ [I refer this often]

Delete a commit --> https://ncona.com/2011/07/how-to-delete-a-commit-in-git-local-and-remote/

https://stackoverflow.com/questions/1628088/reset-local-repository-branch-to-be-just-like-remote-repository-head

http://www.siteground.com/tutorials/git/commands.htm

http://gitreal.codeschool.com/?utm_source=github&utm_medium=codeschool_option&utm_campaign=trygit

https://github.com/tiimgreen/github-cheat-sheet

Reversing a patch ==> https://www.drupal.org/patch/reverse ==> git apply -R path/file.patch

Creating a release --> https://help.github.com/en/articles/creating-releases

Different merges ---> https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-request-merges

Amend a commit -->

• https://www.burntfen.com/2015-10-30/how-to-amend-a-commit-on-a-github-pull-request
• https://medium.com/@igor_marques/git-basics-adding-more-changes-to-your-last-commit-1629344cb9a8
• https://www.educative.io/edpresso/how-to-change-a-git-commit-message-after-a-push

Rebase branches:

• https://www.viget.com/articles/how-to-fix-your-git-branches-after-a-rebase/
• https://thoughtbot.com/blog/git-interactive-rebase-squash-amend-rewriting-history
• https://dev.to/maxwell_dev/the-git-rebase-introduction-i-wish-id-had
• https://www.viget.com/articles/how-to-fix-your-git-branches-after-a-rebase/
• https://lukemerrett.com/removing-mistakes-with-rebase/
• https://opensource.com/article/18/6/git-reset-revert-rebase-commands
• http://gitforteams.com/resources/rebasing.html
• https://www.digitalocean.com/community/tutorials/how-to-rebase-and-update-a-pull-request
• https://git-scm.com/book/en/v2/Git-Branching-Rebasing
• https://blog.algolia.com/master-git-rebase/

Rebase Pull Request:

• https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request

Remove merges from a Pull Request and squash commits:

• https://stackoverflow.com/questions/2389361/undo-a-git-merge-that-hasnt-been-pushed-yet (refer the solution that simply executes git reset --merge ORIG_HEAD)
  • git reset --merge ORIG_HEAD
  • git commit --amend
  • git push origin +<branch_name>

Squash Commits-->

• https://stackoverflow.com/questions/5667884/how-to-squash-commits-in-git-after-they-have-been-pushed

e.g;

git rebase -i origin/master~4 master

git push origin +master

Signing Commits -->

• https://help.github.com/en/github/authenticating-to-github/signing-commits

How to fix git always asking for user credentials

Forcing a CI recheck hack -->

• git commit --amend followed by :wq! without making any changes; next, issue for e.g; git push --force origin branchname
• git commit -s --amend --no-edit followed by git push --force origin branchname

Undoing, fixing, or removing commits in git

• https://sethrobertson.github.io/GitFixUm/fixup.html

Git Interactive learning

• https://learngitbranching.js.org

Create a branch from another user's pull request

• https://odoo-development.readthedocs.io/en/latest/git/checkout-pr.html

2FA Authentication in Github and using https

• https://stackoverflow.com/questions/6565357/git-push-requires-username-and-password

Visit the Settings -> Developer Settings -> Personal Access Tokens page in GitHub (https://github.com/settings/tokens/new), and generate a new Token with all Repo permissions: