Advanced Git Configuration

1# View all configuration settings
2git config --list --show-origin
3
4# Set user identity (global)
5git config --global user.name "Your Name"
6git config --global user.email "[email protected]"
7
8# Set default branch name
9git config --global init.defaultBranch main
10
11# Set default editor
12git config --global core.editor "code --wait"  # VS Code
13git config --global core.editor "vim"          # Vim
14
15# Enable color output
16git config --global color.ui auto
17
18# Set up credential caching
19git config --global credential.helper cache
20git config --global credential.helper 'cache --timeout=3600'
21
22# View specific setting
23git config user.name
24
25# Unset a configuration
26git config --global --unset user.email

1# Simple command shortcuts
2git config --global alias.co checkout
3git config --global alias.br branch
4git config --global alias.ci commit
5git config --global alias.st status
6
7# Now you can use:
8git co main
9git br -a
10git ci -m "message"
11git st

1# Pretty log with graph
2git config --global alias.lg "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
3
4# Show last commit
5git config --global alias.last 'log -1 HEAD'
6
7# Undo last commit (keep changes)
8git config --global alias.undo 'reset HEAD~1 --mixed'
9
10# List aliases
11git config --global alias.aliases "config --get-regexp ^alias."
12
13# Amend last commit without editing message
14git config --global alias.amend 'commit --amend --no-edit'
15
16# Show changed files in last commit
17git config --global alias.changed 'show --name-only'
18
19# Stage all changes and commit
20git config --global alias.ac '!git add -A && git commit'
21
22# Create new branch and switch to it
23git config --global alias.cob 'checkout -b'

1# Delete merged branches (excluding main/master)
2git config --global alias.cleanup "!git branch --merged | grep -v '\*\|main\|master' | xargs -n 1 git branch -d"
3
4# Pull with rebase and autostash
5git config --global alias.up 'pull --rebase --autostash'
6
7# Show contributors with commit count
8git config --global alias.contributors 'shortlog -sn'
9
10# Find commits by message
11git config --global alias.find '!git log --all --grep'
12
13# Show branches sorted by last commit
14git config --global alias.recent "branch --sort=-committerdate"
15
16# Interactive rebase with main
17git config --global alias.rim 'rebase -i main'
18
19# Sync fork with upstream
20git config --global alias.sync '!git fetch upstream && git checkout main && git merge upstream/main'

1#!/bin/sh
2# .git/hooks/pre-commit
3
4echo "Running pre-commit checks..."
5
6# Run linter
7npm run lint
8if [ $? -ne 0 ]; then
9  echo "❌ Linting failed. Commit aborted."
10  exit 1
11fi
12
13# Run tests
14npm test
15if [ $? -ne 0 ]; then
16  echo "❌ Tests failed. Commit aborted."
17  exit 1
18fi
19
20# Check for debugging statements
21if git diff --cached | grep -E "console.(log|debug|info)"; then
22  echo "❌ Found console statements. Please remove them."
23  exit 1
24fi
25
26echo "✅ All checks passed!"
27exit 0

1#!/bin/sh
2# .git/hooks/commit-msg
3
4commit_msg_file=$1
5commit_msg=$(cat "$commit_msg_file")
6
7# Enforce conventional commits format
8# Format: type(scope): subject
9pattern='^(feat|fix|docs|style|refactor|test|chore)((.+))?: .{1,50}'
10
11if ! echo "$commit_msg" | grep -qE "$pattern"; then
12  echo "❌ Invalid commit message format!"
13  echo "Format: type(scope): subject"
14  echo "Types: feat, fix, docs, style, refactor, test, chore"
15  echo ""
16  echo "Examples:"
17  echo "  feat(auth): add login functionality"
18  echo "  fix(api): handle null responses"
19  echo "  docs: update README"
20  exit 1
21fi
22
23echo "✅ Commit message format valid"
24exit 0

1#!/bin/sh
2# .git/hooks/pre-push
3
4protected_branches="main master production"
5current_branch=$(git symbolic-ref HEAD | sed -e 's,.*/(.*),
,')
6
7for branch in $protected_branches; do
8  if [ "$current_branch" = "$branch" ]; then
9    echo "❌ Direct push to $branch is not allowed!"
10    echo "Please use a pull request."
11    exit 1
12  fi
13done
14
15# Run full test suite before push
16echo "Running test suite..."
17npm test
18if [ $? -ne 0 ]; then
19  echo "❌ Tests failed. Push aborted."
20  exit 1
21fi
22
23echo "✅ Push checks passed!"
24exit 0

1# Install Husky
2npm install --save-dev husky
3npx husky install
4
5# Add pre-commit hook
6npx husky add .husky/pre-commit "npm run lint && npm test"
7
8# Add commit-msg hook
9npx husky add .husky/commit-msg 'npx --no -- commitlint --edit "$1"'
10
11# Add pre-push hook
12npx husky add .husky/pre-push "npm test"

1# Ignore all .log files
2*.log
3
4# But track important.log
5!important.log
6
7# Ignore all files in any directory named temp
8**/temp/
9
10# Ignore all .txt files in the doc/ directory but not subdirectories
11/doc/*.txt
12
13# Ignore all .pdf files in doc/ and subdirectories
14doc/**/*.pdf
15
16# Ignore files matching pattern
17build-*.jar
18test-[0-9].js
19
20# Ignore OS specific files
21.DS_Store
22Thumbs.db
23desktop.ini
24
25# Ignore IDE files
26.vscode/
27.idea/
28*.swp
29*.swo
30
31# Ignore environment files
32.env
33.env.local
34.env.*.local
35
36# Ignore dependency directories
37node_modules/
38vendor/
39packages/
40
41# Ignore build outputs
42dist/
43build/
44*.min.js
45*.min.css
46
47# Ignore log and temporary files
48*.log
49*.tmp
50*.temp
51logs/
52tmp/
53
54# Ignore package manager lock files (if needed)
55package-lock.json
56yarn.lock
57pnpm-lock.yaml

1# Auto detect text files and normalize line endings to LF
2* text=auto
3
4# Force LF line endings for these files
5*.sh text eol=lf
6*.bash text eol=lf
7Dockerfile text eol=lf
8
9# Force CRLF line endings for Windows scripts
10*.bat text eol=crlf
11*.cmd text eol=crlf
12
13# Binary files (don't try to merge or diff)
14*.png binary
15*.jpg binary
16*.gif binary
17*.ico binary
18*.pdf binary
19*.zip binary
20*.gz binary
21
22# Mark generated files
23package-lock.json linguist-generated=true
24yarn.lock linguist-generated=true
25
26# Custom diff for specific files
27*.json diff=json
28*.md diff=markdown
29
30# Merge strategies for specific files
31package.json merge=ours
32README.md merge=union
33
34# Filter large files through Git LFS
35*.psd filter=lfs diff=lfs merge=lfs -text
36*.ai filter=lfs diff=lfs merge=lfs -text
37*.zip filter=lfs diff=lfs merge=lfs -text

1# Create global gitignore file
2touch ~/.gitignore_global
3
4# Add OS and editor files
5echo ".DS_Store" >> ~/.gitignore_global
6echo "Thumbs.db" >> ~/.gitignore_global
7echo ".vscode/" >> ~/.gitignore_global
8echo ".idea/" >> ~/.gitignore_global
9
10# Configure Git to use it
11git config --global core.excludesfile ~/.gitignore_global

1# Sign commits with GPG
2git config --global user.signingkey YOUR_GPG_KEY_ID
3git config --global commit.gpgsign true
4
5# Require signed pushes
6git config --global push.gpgSign if-asked
7
8# Enable SSH key signing (Git 2.34+)
9git config --global gpg.format ssh
10git config --global user.signingkey ~/.ssh/id_ed25519.pub
11
12# Prevent commits to specific branches
13git config --global branch.main.protected true
14
15# Warn before pushing to origin
16git config --global push.confirm true

1# Enable parallel operations
2git config --global fetch.parallel 0  # Auto-detect CPU cores
3git config --global submodule.fetchJobs 4
4
5# Improve performance for large repositories
6git config --global core.preloadindex true
7git config --global core.fscache true
8git config --global gc.auto 256
9
10# Set default pull strategy
11git config --global pull.rebase true
12
13# Automatically prune on fetch
14git config --global fetch.prune true
15
16# Enable rerere (reuse recorded resolution)
17git config --global rerere.enabled true
18
19# Set merge conflict style
20git config --global merge.conflictstyle diff3
21
22# Limit diff context lines for performance
23git config --global diff.context 5

1# Set default merge strategy
2git config --global merge.ff false  # Always create merge commit
3
4# Automatically resolve simple conflicts
5git config --global merge.autostash true
6
7# Show file moves in diff
8git config --global diff.renames true
9
10# Colorize moved lines in diff
11git config --global diff.colorMoved default
12
13# Set commit template
14git config --global commit.template ~/.gitmessage
15
16# Auto-correct typos
17git config --global help.autocorrect 1

1# Type: (feat|fix|docs|style|refactor|test|chore)
2# Scope: (component|module affected)
3#
4# Subject: Brief description (50 chars)
5# |<----  Preferably using up to 50 chars  ---->|
6
7
8# Body: Detailed explanation (wrap at 72 chars)
9# |<----   Try To Limit Each Line to a Maximum Of 72 Characters   ---->|
10
11
12# Footer: Issue references, breaking changes
13# Example:
14# Fixes #123
15# BREAKING CHANGE: API endpoint changed from /api/v1 to /api/v2
16
17# Type options:
18# - feat: A new feature
19# - fix: A bug fix
20# - docs: Documentation only changes
21# - style: Code style changes (formatting)
22# - refactor: Code change that neither fixes a bug nor adds a feature
23# - test: Adding missing tests or correcting existing tests
24# - chore: Changes to build process or auxiliary tools

1# Show all configuration with sources
2git config --list --show-origin
3
4# Show only global configuration
5git config --global --list
6
7# Get value of specific setting
8git config --get user.email
9
10# Get all values for a key (if multiple)
11git config --get-all remote.origin.fetch
12
13# Edit config file directly
14git config --global --edit
15
16# Remove a configuration
17git config --global --unset user.email
18
19# Remove entire section
20git config --global --remove-section user