Git Programming Tutorials, Guides & Best Practices

Extract a subdirectory into its own repository:

git filter-repo --path path/to/subdir

No preview available for this content.

name: Deploy

on:
  push:
    branches:
      - main

jobs:
  deploy:

    runs-on: ubuntu-latest

    steps:
    - uses: actions/checkout@v3

    - name: Deploy to server
      env:
        SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
      run: |
        ssh-agent bash -c 'ssh-add <(echo "$SSH_PRIVATE_KEY") && ssh -o StrictHostKeyChecking=no user@server "cd /path/to/app && git pull && npm install && pm2 restart all"'

• on: push: Triggers the workflow when there’s a push to the main branch.
• secrets.SSH_PRIVATE_KEY: Retrieves the SSH key stored in GitHub Secrets, ensuring secure deployment.

Rebasing is a way to integrate changes from one branch into another. Unlike merge, which creates a new commit to combine the histories of the two branches, rebase moves or combines a sequence of commits to a new base commit. This can help keep your commit history linear and more readable.

# Rebase the current branch onto another branch
git rebase <branch>

# Rebase interactively, allowing you to squash, reword, or drop commits
git rebase -i <branch>

# Continue rebase after resolving conflicts
git rebase --continue

# Skip the current commit during a rebase
git rebase --skip

# Abort a rebase and return to the original branch state
git rebase --abort