Common git operations » History » Version 18
cryptogopher, 2022-09-16 00:03
| 1 | 1 | cryptogopher | h1. Common git operations |
|---|---|---|---|
| 2 | |||
| 3 | 5 | cryptogopher | {{>toc}} |
| 4 | 1 | cryptogopher | |
| 5 | Prerequisites: |
||
| 6 | <pre> |
||
| 7 | cd ~/plugins/issue_recurring |
||
| 8 | </pre> |
||
| 9 | |||
| 10 | 14 | cryptogopher | h2. Issue/pull request resolution in separate branch |
| 11 | 1 | cryptogopher | |
| 12 | 2 | cryptogopher | h3. Create separate branch for issue |
| 13 | 3 | cryptogopher | |
| 14 | 2 | cryptogopher | # Checkout and update master: |
| 15 | <pre> |
||
| 16 | $ git checkout master |
||
| 17 | $ git pull |
||
| 18 | </pre> |
||
| 19 | # Create, checkout new branch and push it to remote (so it will be tracked and replicated on it.michalczyk.pro): |
||
| 20 | <pre> |
||
| 21 | $ git checkout -b issueN |
||
| 22 | $ git push -u origin issueN |
||
| 23 | </pre> |
||
| 24 | 9 | cryptogopher | # Reload all files open in vim: |
| 25 | 7 | cryptogopher | <pre> |
| 26 | :bufdo! e |
||
| 27 | </pre> |
||
| 28 | |||
| 29 | 16 | cryptogopher | h3. Checkout pull request locally (for editing, testing etc.) |
| 30 | |||
| 31 | 17 | cryptogopher | "Github docs":https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/checking-out-pull-requests-locally#modifying-an-inactive-pull-request-locally |
| 32 | |||
| 33 | 16 | cryptogopher | # Fetch pull request based on its number into new branch and switch to new branch: |
| 34 | <pre> |
||
| 35 | $ git fetch origin pull/N/head:prN |
||
| 36 | $ git checkout prN |
||
| 37 | </pre> |
||
| 38 | # (optionally) Push newly created branch: |
||
| 39 | <pre> |
||
| 40 | git push -u origin prN |
||
| 41 | </pre> |
||
| 42 | |||
| 43 | 13 | cryptogopher | h3. Merge issue/pull request branch into master |
| 44 | 2 | cryptogopher | |
| 45 | # Push uncommited changes on issue branch. |
||
| 46 | 1 | cryptogopher | # Checkout and update master: |
| 47 | <pre> |
||
| 48 | $ git checkout master |
||
| 49 | $ git pull |
||
| 50 | </pre> |
||
| 51 | 13 | cryptogopher | # Merge adding comment _closes #N_ (for issue branch), optionally view commits and push issueN/prN branch: |
| 52 | 1 | cryptogopher | <pre> |
| 53 | $ git merge issueN |
||
| 54 | 13 | cryptogopher | $ git log origin/master..HEAD |
| 55 | 5 | cryptogopher | $ git push |
| 56 | 10 | cryptogopher | </pre> |
| 57 | # Delete merged branch from local and remote: |
||
| 58 | 11 | cryptogopher | <pre> |
| 59 | $ git branch -d issueN |
||
| 60 | 12 | cryptogopher | $ git push origin :issueN |
| 61 | </pre> |
||
| 62 | # Verify: |
||
| 63 | <pre> |
||
| 64 | $ git branch -a |
||
| 65 | </pre> |
||
| 66 | 11 | cryptogopher | |
| 67 | |||
| 68 | 5 | cryptogopher | h2. Release |
| 69 | 4 | cryptogopher | |
| 70 | h3. Move tag to different commit (e.g. after fixing some mistake) |
||
| 71 | |||
| 72 | # Remove tag from remote (if it has been pushed): |
||
| 73 | <pre> |
||
| 74 | git push origin :refs/tags/1.3 |
||
| 75 | </pre> |
||
| 76 | # Force replacement of existing tag with one referencing most recent commit: |
||
| 77 | <pre> |
||
| 78 | git tag -fa 1.3 |
||
| 79 | </pre> |
||
| 80 | # Push: |
||
| 81 | <pre> |
||
| 82 | git push origin 1.3 |
||
| 83 | </pre> |
||
| 84 | 18 | cryptogopher | |
| 85 | |||
| 86 | h2. Other |
||
| 87 | |||
| 88 | h3. Change remote URL from HTTPS to SSH (required by Github's no-password policy) |
||
| 89 | |||
| 90 | # Check current URL: |
||
| 91 | <pre> |
||
| 92 | git remote -v |
||
| 93 | </pre> |
||
| 94 | # Change to SSH: |
||
| 95 | <pre> |
||
| 96 | git remote set-url origin git@github.com:cryptogopher/issue_recurring.git |
||
| 97 | </pre> |