Git Workflow

Git Workflow Commands Overview

• Working Directory - Where you make changes
• git add - Stage changes
• git commit - Save changes to your repository
• git push - Share changes with others
• git status - Check what's going on
• Undo/Amend - Fix mistakes (git restore, git reset, git commit --amend)

Understanding the Git Workflow

Git uses a distributed workflow that allows you to work on your code, stage changes, and commit them to your local repository before sharing with others.

Understanding this workflow is essential for effective version control.

The Three Areas of Git

• Working Directory: Where you make changes to your files.
• Staging Area (Index): Where you prepare changes before committing.
• Repository: Where your committed history is stored.

[Working Directory] --git add--> [Staging Area] --git commit--> [Repository]
  

Best Practices for Git Workflow

Working Directory

This is where you make changes to your files.

Think of it as your workspace or desk.

Files here can be new, modified, or deleted, but Git won't save these changes until you stage and commit them.

Staging Changes (git add)

When you are happy with your changes, you "stage" them with git add.

This puts your changes in the Staging Area, like putting your finished letter in an envelope.

git add index.html

To stage all changes (new, modified, and deleted files):

git add .

Committing Changes (git commit)

Committing saves your staged changes to your local repository.

It's like mailing your letter: you can't change it after it's sent!

git commit -m "Describe your changes"
[main 291a117] Describe your changes
 1 file changed, 1 insertion(+)

You can also use git commit -a -m "message" to stage and commit all modified and deleted files in one step (but not new files).

Pushing Changes (git push)

After you commit, your changes are only in your local repository.

Use git push to send your commits to a remote repository (like GitHub or Bitbucket) so others can see them.

git push

Checking Status (git status)

Use git status to see which files are staged, unstaged, or untracked.

This helps you keep track of what you still need to add or commit.

git status
On branch main
Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        modified:   index.html

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   style.css

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        app.js

Undoing and Amending Changes

Made a mistake? Git lets you fix things before you push!

• git restore <file> - Undo changes in your working directory (before staging).
• git restore --staged <file> - Unstage a file (move it out of the Staging Area).
• git reset HEAD~ - Undo your last commit (keeps changes in your working directory).
• git commit --amend - Change the last commit message or add files to your last commit.

git restore --staged index.html

Tips & Troubleshooting

• Use git status often to see what's going on.
• If you commit the wrong thing, use git reset or git commit --amend before pushing.
• Stage only what you want to commit. Use git add <filename> for specific files.
• Don't forget to push after committing, or your changes won't show up for others.
• If you're not sure, ask for help or look up the error message. Everyone makes mistakes!