Update README with new features

Author: whtiehack

README.md

@@ -5,8 +5,12 @@ An Obsidian plugin that automatically commits vault changes to git.
 ## Features
 
 - **Auto Commit**: Automatically commit changes after file modifications (with debounce)
-- **Manual Commit**: Commands for manual commit and push
+- **Auto Pull**: Optionally pull from remote when Obsidian opens
 - **Auto Push**: Optionally push to remote after commit
+- **Manual Operations**: Commands for manual pull, commit, and push
+- **Conflict Detection**: Detect merge conflicts and pause auto-commit until resolved
+- **Git Status Badges**: Show colored dots next to modified/new files in file explorer
+- **Repository Management**: Initialize repo and configure remote URL from settings
 - **Custom Template**: Configurable commit message with variables
 - **File List**: Optionally include changed file list in commit body
 - **i18n**: English and Chinese UI support
@@ -16,7 +20,7 @@ An Obsidian plugin that automatically commits vault changes to git.
 ### From GitHub Releases (Recommended)
 
 1. Go to [Releases](https://github.com/whtiehack/obsidian-git-auto-commit/releases)
-2. Download `main.js` and `manifest.json` from the latest release
+2. Download `main.js`, `manifest.json`, and `styles.css` from the latest release
 3. Create folder `<vault>/.obsidian/plugins/auto-git-commit/`
 4. Copy downloaded files into the folder
 5. Restart Obsidian and enable the plugin in Settings → Community plugins
@@ -30,27 +34,61 @@ npm install
 npm run build
 ```
 
-Then copy `main.js` and `manifest.json` to your vault's plugin folder.
+Then copy `main.js`, `manifest.json`, and `styles.css` to your vault's plugin folder.
 
 ## Commands
 
 | Command | Description |
 |---------|-------------|
-| `Auto Git Commit: Commit now` | Commit all changes immediately |
-| `Auto Git Commit: Commit and push` | Commit and push to remote |
+| `Commit now` | Commit all changes |
+| `Commit and push` | Commit and push to remote |
+| `Pull now` | Pull from remote |
+| `Push now` | Push to remote |
+| `Mark conflicts as resolved` | Mark conflicts as resolved (only shown when conflicts exist) |
 
 ## Settings
 
+### Automation
+
 | Option | Description | Default |
 |--------|-------------|---------|
+| Auto pull on open | Pull from remote when Obsidian opens | Off |
 | Enable auto commit | Auto commit after file changes | Off |
 | Debounce delay (seconds) | Wait time before committing | 30 |
 | Auto push after commit | Push to remote after commit | Off |
+
+### Configuration
+
+| Option | Description | Default |
+|--------|-------------|---------|
 | Commit message template | Custom message format | `vault backup: {{date}} {{time}}` |
 | Include file list in commit body | List changed files in body | On |
+| Show git status in file explorer | Display colored dots next to changed files | On |
 | Git binary path | Path to git executable | `git` |
 | Ignore .obsidian directory | Exclude config folder from triggers | On |
 
+### Repository
+
+- **Pull**: Pull from remote repository
+- **Commit**: Commit all changes
+- **Push**: Push to remote repository
+- **Remote URL**: Configure remote repository URL
+- **Initialize**: Initialize git repository (if not initialized)
+- **Resolve Conflicts**: Mark conflicts as resolved (only shown when conflicts exist)
+
+## Git Status Badges
+
+Colored dots are displayed next to files in the file explorer:
+
+| Color | Status |
+|-------|--------|
+| 🟡 Yellow | Modified |
+| 🟢 Green | New/Added |
+| 🔴 Red | Deleted or Conflict |
+| 🔵 Blue | Renamed |
+
+Folders show the highest priority status of their contents.
+
 ## Template Variables
 
 | Variable | Description | Example |
@@ -60,18 +98,6 @@ Then copy `main.js` and `manifest.json` to your vault's plugin folder.
 | `{{files}}` | Changed files (max 5) | `a.md, b.md, ...` |
 | `{{count}}` | Number of changed files | `3` |
 
-## Example Commit
-
-With "Include file list" enabled:
-
-```
-vault backup: 2025-12-20 10:30:00
-
-notes/daily/2025-12-20.md
-attachments/image.png
-templates/note.md
-```
-
 ## Requirements
 
 - Obsidian 1.2.0+