my-notes

git_add_commit

2 min read

git add & commit

Stage changes and create commits.

➕ git add

Stage Single File

git add filename.txt

Stages filename.txt for the next commit.

Stage Multiple Files

git add file1.txt file2.txt file3.txt

Stages multiple specific files.

Stage All Changes

git add .

Stages all modified and new files in current directory and subdirectories.

Stage All Changes (Alternative)

git add -A

Stages all changes including deletions. Same as git add --all.

Stage Only Modified Files

git add -u

Stages only modified and deleted files, not new untracked files.

Stage by Pattern

git add *.js

Stages all JavaScript files in current directory.

Stage Folder

git add src/

Stages all files in the src folder.

Interactive Staging

git add -p

Opens interactive mode to stage parts of files (hunks).

Interactive options:

  • y - stage this hunk
  • n - skip this hunk
  • s - split into smaller hunks
  • e - manually edit the hunk
  • q - quit

Stage with Intent to Add

git add -N filename.txt

Records that file will be added, but doesn't stage content yet.

📊 Staging Flow

graph LR
    A[Working Directory] -->|git add| B[Staging Area]
    B -->|git commit| C[Repository]
    A -->|Unstaged changes| A

📝 git commit

Commit with Message

git commit -m "Add login feature"

Creates a commit with the specified message.

Commit with Multi-line Message

git commit -m "Add login feature" -m "Includes validation and error handling"

Creates a commit with title and description.

Commit All Modified Files

git commit -am "Fix bug in header"

Stages all modified tracked files and commits. Does not include new files.

Commit with Editor

git commit

Opens your configured editor to write a detailed commit message.

Amend Last Commit Message

git commit --amend -m "New commit message"

Changes the message of the last commit.

Amend Last Commit (Add Files)

git commit --amend --no-edit

Adds currently staged files to the last commit without changing the message.

Empty Commit

git commit --allow-empty -m "Trigger CI build"

Creates a commit with no changes. Useful for triggering CI/CD.

Commit with Author

git commit --author="John Doe <john@example.com>" -m "Pair programming commit"

Creates commit with a different author.

Signed Commit

git commit -S -m "Signed commit"

Creates a GPG-signed commit.

✍️ Commit Message Format

Conventional Commits

type(scope): subject

body

footer

Types:

  • feat - New feature
  • fix - Bug fix
  • docs - Documentation
  • style - Formatting
  • refactor - Code restructure
  • test - Tests
  • chore - Maintenance

Example Message

feat(auth): add password reset functionality

- Add forgot password page
- Send reset email with token
- Validate token expiration

Closes #123

📊 Commit Flow

graph TD
    A[Staged Changes] -->|git commit| B[Create Snapshot]
    B --> C[Generate SHA-1 Hash]
    C --> D[Link to Parent Commit]
    D --> E[Update HEAD/Branch]

💡 Tips

Good Commit Messages
  • Use imperative mood: "Add feature" not "Added feature"
  • Keep subject line under 50 characters
  • Wrap body at 72 characters
Atomic Commits

Each commit should be one logical change.

🔗 Related

#git #add #commit #staging #basics

Built with mdgarden