From cebbbb73f973ca76a7dbee4e012356588a5a40a0 Mon Sep 17 00:00:00 2001
From: Dawid Zbinski <dawid@zbinski.dev>
Date: Mon, 2 Mar 2026 12:05:16 +0100
Subject: [PATCH] feat: add flag shortcuts

---
 .task/checksum/docs                     |  2 +-
 README.md                               | 83 +++++++++++++------------
 internal/cli/command.go                 | 13 ++--
 internal/cli/command_test.go            | 33 +++++++++-
 internal/cli/completion_install_cmd.go  |  2 +-
 internal/cli/config_get.go              |  2 +-
 internal/cli/config_report.go           |  6 +-
 internal/cli/config_reset.go            |  4 +-
 internal/cli/config_set.go              |  2 +-
 internal/cli/defaults_report.go         |  4 +-
 internal/cli/defaults_reset.go          |  2 +-
 internal/cli/edit.go                    | 14 ++---
 internal/cli/history.go                 |  4 +-
 internal/cli/init.go                    |  8 +--
 internal/cli/log.go                     | 14 ++---
 internal/cli/project_assign.go          |  4 +-
 internal/cli/project_remove.go          |  2 +-
 internal/cli/remove.go                  |  4 +-
 internal/cli/report.go                  | 10 +--
 internal/cli/report_test.go             | 43 +++++++++++--
 internal/cli/status.go                  |  2 +-
 internal/cli/sync.go                    |  2 +-
 web/docs/commands/defaults.md           |  6 +-
 web/docs/commands/project-management.md |  6 +-
 web/docs/commands/schedule.md           | 14 ++---
 web/docs/commands/shell-completions.md  |  2 +-
 web/docs/commands/time-tracking.md      | 55 ++++++++--------
 27 files changed, 206 insertions(+), 137 deletions(-)

diff --git a/.task/checksum/docs b/.task/checksum/docs
index 85867b3..5eb9552 100644
--- a/.task/checksum/docs
+++ b/.task/checksum/docs
@@ -1 +1 @@
-8cdc8a0d92ea52364fe347f5b64a72e6
+f998a0f05834950ec6719dfc2c4a6c95
diff --git a/README.md b/README.md
index 292bfb8..2b1a035 100644
--- a/README.md
+++ b/README.md
@@ -119,10 +119,10 @@ hourgit init [--project <name>] [--force] [--merge] [--yes]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--project` | auto-detect | Assign repository to a project by name or ID (creates if needed) |
-| `--force` | `false` | Overwrite existing post-checkout hook |
-| `--merge` | `false` | Append to existing post-checkout hook |
-| `--yes` | `false` | Skip confirmation prompt |
+| `-p`, `--project` | auto-detect | Assign repository to a project by name or ID (creates if needed) |
+| `-f`, `--force` | `false` | Overwrite existing post-checkout hook |
+| `-m`, `--merge` | `false` | Append to existing post-checkout hook |
+| `-y`, `--yes` | `false` | Skip confirmation prompt |
 
 #### `hourgit log`
 
@@ -134,12 +134,12 @@ hourgit log [MESSAGE] [--duration <dur>] [--from <time>] [--to <time>] [--date <
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--project` | auto-detect | Project name or ID |
-| `--duration` | — | Duration to log (e.g. `30m`, `3h`, `1d3h30m`) |
-| `--from` | — | Start time (e.g. `9am`, `14:00`) |
-| `--to` | — | End time (e.g. `5pm`, `17:00`) |
-| `--date` | today | Date to log for (`YYYY-MM-DD`) |
-| `--task` | — | Task label for this entry |
+| `-p`, `--project` | auto-detect | Project name or ID |
+| `-d`, `--duration` | — | Duration to log (e.g. `30m`, `3h`, `1d3h30m`) |
+| `-F`, `--from` | — | Start time (e.g. `9am`, `14:00`) |
+| `-T`, `--to` | — | End time (e.g. `5pm`, `17:00`) |
+| `-D`, `--date` | today | Date to log for (`YYYY-MM-DD`) |
+| `-t`, `--task` | — | Task label for this entry |
 
 > `--duration` and `--from`/`--to` are mutually exclusive. A message is always required (prompted if not provided).
 
@@ -170,13 +170,14 @@ hourgit edit <hash> [--duration <dur>] [--from <time>] [--to <time>] [--date <da
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--project` | auto-detect | Project name or ID |
-| `--duration` | — | New duration (e.g. `30m`, `3h`, `3h30m`) |
-| `--from` | — | New start time (e.g. `9am`, `14:00`) |
-| `--to` | — | New end time (e.g. `5pm`, `17:00`) |
-| `--date` | — | New date (`YYYY-MM-DD`) |
-| `--task` | — | New task label (empty string clears it) |
+| `-p`, `--project` | auto-detect | Project name or ID |
+| `-d`, `--duration` | — | New duration (e.g. `30m`, `3h`, `3h30m`) |
+| `-F`, `--from` | — | New start time (e.g. `9am`, `14:00`) |
+| `-T`, `--to` | — | New end time (e.g. `5pm`, `17:00`) |
+| `-D`, `--date` | — | New date (`YYYY-MM-DD`) |
+| `-t`, `--task` | — | New task label (empty string clears it) |
 | `-m`, `--message` | — | New message |
+| `-y`, `--yes` | `false` | Skip confirmation prompt |
 
 > `--duration` and `--from`/`--to` are mutually exclusive. `--from` only: keeps existing end time, recalculates duration. `--to` only: keeps existing start time, recalculates duration. Entry ID and creation timestamp are preserved. If the entry is not found in the current repo's project, all projects are searched.
 
@@ -200,8 +201,8 @@ hourgit remove <hash> [--project <name>] [--yes]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--project` | auto-detect | Project name or ID |
-| `--yes` | `false` | Skip confirmation prompt |
+| `-p`, `--project` | auto-detect | Project name or ID |
+| `-y`, `--yes` | `false` | Skip confirmation prompt |
 
 > Works with both log and checkout entries (unlike `edit`, which only supports log entries). Shows entry details and asks for confirmation before deleting. If the entry is not found in the current repo's project, all projects are searched.
 
@@ -215,7 +216,7 @@ hourgit sync [--project <name>]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--project` | auto-detect | Project name or ID |
+| `-p`, `--project` | auto-detect | Project name or ID |
 
 #### `hourgit report`
 
@@ -227,11 +228,11 @@ hourgit report [--month <1-12>] [--week <1-53>] [--year <YYYY>] [--project <name
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--month` | current month | Month number 1-12 |
-| `--week` | — | ISO week number 1-53 |
-| `--year` | current year | Year (complementary to `--month` or `--week`) |
-| `--project` | auto-detect | Project name or ID |
-| `--export` | — | Export format (`pdf`); auto-generates filename based on period |
+| `-m`, `--month` | current month | Month number 1-12 |
+| `-w`, `--week` | — | ISO week number 1-53 |
+| `-y`, `--year` | current year | Year (complementary to `--month` or `--week`) |
+| `-p`, `--project` | auto-detect | Project name or ID |
+| `-e`, `--export` | — | Export format (`pdf`); auto-generates filename based on period |
 
 > `--month` and `--week` cannot be used together. `--year` alone is not valid — it must be paired with `--month` or `--week`. Neither flag defaults to the current month.
 
@@ -270,8 +271,8 @@ hourgit history [--project <name>] [--limit <N>]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--project` | all projects | Filter by project name or ID |
-| `--limit` | `50` | Maximum number of entries to show (use `0` for all) |
+| `-p`, `--project` | all projects | Filter by project name or ID |
+| `-l`, `--limit` | `50` | Maximum number of entries to show (use `0` for all) |
 
 > Each line shows the entry hash, timestamp, type (log or checkout), project name, and details. Log entries display duration + task label (if set) + message. Checkout entries display previous branch → next branch.
 
@@ -285,7 +286,7 @@ hourgit status [--project <name>]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--project` | auto-detect | Project name or ID |
+| `-p`, `--project` | auto-detect | Project name or ID |
 
 **Output includes:**
 
@@ -321,8 +322,8 @@ hourgit project assign <name> [--force] [--yes]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--force` | `false` | Reassign repository to a different project |
-| `--yes` | `false` | Skip confirmation prompt |
+| `-f`, `--force` | `false` | Reassign repository to a different project |
+| `-y`, `--yes` | `false` | Skip confirmation prompt |
 
 #### `hourgit project list`
 
@@ -344,7 +345,7 @@ hourgit project remove <name> [--yes]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--yes` | `false` | Skip confirmation prompt |
+| `-y`, `--yes` | `false` | Skip confirmation prompt |
 
 ### Schedule Configuration
 
@@ -362,7 +363,7 @@ hourgit config get [--project <name>]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--project` | auto-detect | Project name or ID |
+| `-p`, `--project` | auto-detect | Project name or ID |
 
 #### `hourgit config set`
 
@@ -374,7 +375,7 @@ hourgit config set [--project <name>]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--project` | auto-detect | Project name or ID |
+| `-p`, `--project` | auto-detect | Project name or ID |
 
 #### `hourgit config reset`
 
@@ -386,8 +387,8 @@ hourgit config reset [--project <name>] [--yes]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--project` | auto-detect | Project name or ID |
-| `--yes` | `false` | Skip confirmation prompt |
+| `-p`, `--project` | auto-detect | Project name or ID |
+| `-y`, `--yes` | `false` | Skip confirmation prompt |
 
 #### `hourgit config report`
 
@@ -399,9 +400,9 @@ hourgit config report [--project <name>] [--month <1-12>] [--year <YYYY>]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--project` | auto-detect | Project name or ID |
-| `--month` | current month | Month number 1-12 |
-| `--year` | current year | Year |
+| `-p`, `--project` | auto-detect | Project name or ID |
+| `-m`, `--month` | current month | Month number 1-12 |
+| `-y`, `--year` | current year | Year |
 
 ### Default Schedule
 
@@ -439,7 +440,7 @@ hourgit defaults reset [--yes]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--yes` | `false` | Skip confirmation prompt |
+| `-y`, `--yes` | `false` | Skip confirmation prompt |
 
 #### `hourgit defaults report`
 
@@ -451,8 +452,8 @@ hourgit defaults report [--month <1-12>] [--year <YYYY>]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--month` | current month | Month number 1-12 |
-| `--year` | current year | Year |
+| `-m`, `--month` | current month | Month number 1-12 |
+| `-y`, `--year` | current year | Year |
 
 ### Shell Completions
 
@@ -470,7 +471,7 @@ hourgit completion install [SHELL] [--yes]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--yes` | `false` | Skip confirmation prompt |
+| `-y`, `--yes` | `false` | Skip confirmation prompt |
 
 #### `hourgit completion generate`
 
diff --git a/internal/cli/command.go b/internal/cli/command.go
index 4fa299e..820ac8d 100644
--- a/internal/cli/command.go
+++ b/internal/cli/command.go
@@ -4,9 +4,10 @@ import "github.com/spf13/cobra"
 
 // BoolFlag defines a boolean flag for a command.
 type BoolFlag struct {
-	Name    string
-	Usage   string
-	Default bool
+	Name      string
+	Shorthand string
+	Usage     string
+	Default   bool
 }
 
 // StringFlag defines a string flag for a command.
@@ -37,7 +38,11 @@ func (lc LeafCommand) Build() *cobra.Command {
 		RunE:  lc.RunE,
 	}
 	for _, f := range lc.BoolFlags {
-		cmd.Flags().Bool(f.Name, f.Default, f.Usage)
+		if f.Shorthand != "" {
+			cmd.Flags().BoolP(f.Name, f.Shorthand, f.Default, f.Usage)
+		} else {
+			cmd.Flags().Bool(f.Name, f.Default, f.Usage)
+		}
 	}
 	for _, f := range lc.StrFlags {
 		if f.Shorthand != "" {
diff --git a/internal/cli/command_test.go b/internal/cli/command_test.go
index 4de9466..99290be 100644
--- a/internal/cli/command_test.go
+++ b/internal/cli/command_test.go
@@ -14,11 +14,11 @@ func TestLeafCommandBuild(t *testing.T) {
 		Short: "A test command",
 		Args:  cobra.ExactArgs(1),
 		BoolFlags: []BoolFlag{
-			{Name: "verbose", Usage: "enable verbose output", Default: false},
+			{Name: "verbose", Shorthand: "v", Usage: "enable verbose output", Default: false},
 			{Name: "dry-run", Usage: "simulate execution", Default: true},
 		},
 		StrFlags: []StringFlag{
-			{Name: "output", Usage: "output file", Default: "out.txt"},
+			{Name: "output", Shorthand: "o", Usage: "output file", Default: "out.txt"},
 		},
 		RunE: func(cmd *cobra.Command, args []string) error { return nil },
 	}.Build()
@@ -31,6 +31,7 @@ func TestLeafCommandBuild(t *testing.T) {
 	verbose := cmd.Flags().Lookup("verbose")
 	require.NotNil(t, verbose)
 	assert.Equal(t, "false", verbose.DefValue)
+	assert.Equal(t, "v", verbose.Shorthand)
 
 	dryRun := cmd.Flags().Lookup("dry-run")
 	require.NotNil(t, dryRun)
@@ -39,6 +40,34 @@ func TestLeafCommandBuild(t *testing.T) {
 	output := cmd.Flags().Lookup("output")
 	require.NotNil(t, output)
 	assert.Equal(t, "out.txt", output.DefValue)
+	assert.Equal(t, "o", output.Shorthand)
+}
+
+func TestLeafCommandShortFlags(t *testing.T) {
+	var gotVerbose bool
+	var gotOutput string
+
+	cmd := LeafCommand{
+		Use:   "test",
+		Short: "A test command",
+		BoolFlags: []BoolFlag{
+			{Name: "verbose", Shorthand: "v", Usage: "enable verbose output"},
+		},
+		StrFlags: []StringFlag{
+			{Name: "output", Shorthand: "o", Usage: "output file"},
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
+			gotVerbose, _ = cmd.Flags().GetBool("verbose")
+			gotOutput, _ = cmd.Flags().GetString("output")
+			return nil
+		},
+	}.Build()
+
+	cmd.SetArgs([]string{"-v", "-o", "result.txt"})
+	require.NoError(t, cmd.Execute())
+
+	assert.True(t, gotVerbose)
+	assert.Equal(t, "result.txt", gotOutput)
 }
 
 func TestLeafCommandBuildNoFlags(t *testing.T) {
diff --git a/internal/cli/completion_install_cmd.go b/internal/cli/completion_install_cmd.go
index 2991d43..92619da 100644
--- a/internal/cli/completion_install_cmd.go
+++ b/internal/cli/completion_install_cmd.go
@@ -13,7 +13,7 @@ var completionInstallCmd = LeafCommand{
 	Short: "Install shell completions into your shell config",
 	Args:  cobra.RangeArgs(0, 1),
 	BoolFlags: []BoolFlag{
-		{Name: "yes", Usage: "Skip confirmation prompt"},
+		{Name: "yes", Shorthand: "y", Usage: "Skip confirmation prompt"},
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		shell := ""
diff --git a/internal/cli/config_get.go b/internal/cli/config_get.go
index 2cf95b7..79f723e 100644
--- a/internal/cli/config_get.go
+++ b/internal/cli/config_get.go
@@ -11,7 +11,7 @@ var configGetCmd = LeafCommand{
 	Use:   "get",
 	Short: "Show the schedule configuration for a project",
 	StrFlags: []StringFlag{
-		{Name: "project", Usage: "project name or ID (auto-detected from repo if omitted)"},
+		{Name: "project", Shorthand: "p", Usage: "project name or ID (auto-detected from repo if omitted)"},
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		homeDir, repoDir, err := getContextPaths()
diff --git a/internal/cli/config_report.go b/internal/cli/config_report.go
index fac65a0..71edc8d 100644
--- a/internal/cli/config_report.go
+++ b/internal/cli/config_report.go
@@ -12,9 +12,9 @@ var configReportCmd = LeafCommand{
 	Use:   "report",
 	Short: "Show expanded working hours for a given month",
 	StrFlags: []StringFlag{
-		{Name: "project", Usage: "project name or ID (auto-detected from repo if omitted)"},
-		{Name: "month", Usage: "month number 1-12 (default: current)"},
-		{Name: "year", Usage: "year (default: current)"},
+		{Name: "project", Shorthand: "p", Usage: "project name or ID (auto-detected from repo if omitted)"},
+		{Name: "month", Shorthand: "m", Usage: "month number 1-12 (default: current)"},
+		{Name: "year", Shorthand: "y", Usage: "year (default: current)"},
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		homeDir, repoDir, err := getContextPaths()
diff --git a/internal/cli/config_reset.go b/internal/cli/config_reset.go
index 2ad30be..4b92aa0 100644
--- a/internal/cli/config_reset.go
+++ b/internal/cli/config_reset.go
@@ -11,10 +11,10 @@ var configResetCmd = LeafCommand{
 	Use:   "reset",
 	Short: "Reset a project's schedule to the defaults",
 	StrFlags: []StringFlag{
-		{Name: "project", Usage: "project name or ID (auto-detected from repo if omitted)"},
+		{Name: "project", Shorthand: "p", Usage: "project name or ID (auto-detected from repo if omitted)"},
 	},
 	BoolFlags: []BoolFlag{
-		{Name: "yes", Usage: "skip confirmation prompt"},
+		{Name: "yes", Shorthand: "y", Usage: "skip confirmation prompt"},
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		homeDir, repoDir, err := getContextPaths()
diff --git a/internal/cli/config_set.go b/internal/cli/config_set.go
index bd5a6cc..93d750f 100644
--- a/internal/cli/config_set.go
+++ b/internal/cli/config_set.go
@@ -10,7 +10,7 @@ var configSetCmd = LeafCommand{
 	Use:   "set",
 	Short: "Interactively edit a project's schedule",
 	StrFlags: []StringFlag{
-		{Name: "project", Usage: "project name or ID (auto-detected from repo if omitted)"},
+		{Name: "project", Shorthand: "p", Usage: "project name or ID (auto-detected from repo if omitted)"},
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		homeDir, repoDir, err := getContextPaths()
diff --git a/internal/cli/defaults_report.go b/internal/cli/defaults_report.go
index f4ab7b9..9036892 100644
--- a/internal/cli/defaults_report.go
+++ b/internal/cli/defaults_report.go
@@ -12,8 +12,8 @@ var defaultsReportCmd = LeafCommand{
 	Use:   "report",
 	Short: "Show expanded default working hours for a given month",
 	StrFlags: []StringFlag{
-		{Name: "month", Usage: "month number 1-12 (default: current)"},
-		{Name: "year", Usage: "year (default: current)"},
+		{Name: "month", Shorthand: "m", Usage: "month number 1-12 (default: current)"},
+		{Name: "year", Shorthand: "y", Usage: "year (default: current)"},
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		homeDir, err := os.UserHomeDir()
diff --git a/internal/cli/defaults_reset.go b/internal/cli/defaults_reset.go
index ead083c..dd82115 100644
--- a/internal/cli/defaults_reset.go
+++ b/internal/cli/defaults_reset.go
@@ -12,7 +12,7 @@ var defaultsResetCmd = LeafCommand{
 	Use:   "reset",
 	Short: "Reset the default schedule to factory settings (Mon-Fri 9am-5pm)",
 	BoolFlags: []BoolFlag{
-		{Name: "yes", Usage: "skip confirmation prompt"},
+		{Name: "yes", Shorthand: "y", Usage: "skip confirmation prompt"},
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		homeDir, err := os.UserHomeDir()
diff --git a/internal/cli/edit.go b/internal/cli/edit.go
index 8f0a73c..93d2fac 100644
--- a/internal/cli/edit.go
+++ b/internal/cli/edit.go
@@ -14,15 +14,15 @@ var editCmd = LeafCommand{
 	Short: "Edit an existing log entry",
 	Args:  cobra.ExactArgs(1),
 	BoolFlags: []BoolFlag{
-		{Name: "yes", Usage: "skip confirmation prompts"},
+		{Name: "yes", Shorthand: "y", Usage: "skip confirmation prompts"},
 	},
 	StrFlags: []StringFlag{
-		{Name: "project", Usage: "project name or ID (auto-detected from repo if omitted)"},
-		{Name: "duration", Usage: "new duration (e.g. 30m, 3h, 3h30m)"},
-		{Name: "from", Usage: "new start time (e.g. 9am, 14:00)"},
-		{Name: "to", Usage: "new end time (e.g. 5pm, 17:00)"},
-		{Name: "date", Usage: "new date (YYYY-MM-DD)"},
-		{Name: "task", Usage: "new task label (empty string clears it)"},
+		{Name: "project", Shorthand: "p", Usage: "project name or ID (auto-detected from repo if omitted)"},
+		{Name: "duration", Shorthand: "d", Usage: "new duration (e.g. 30m, 3h, 3h30m)"},
+		{Name: "from", Shorthand: "F", Usage: "new start time (e.g. 9am, 14:00)"},
+		{Name: "to", Shorthand: "T", Usage: "new end time (e.g. 5pm, 17:00)"},
+		{Name: "date", Shorthand: "D", Usage: "new date (YYYY-MM-DD)"},
+		{Name: "task", Shorthand: "t", Usage: "new task label (empty string clears it)"},
 		{Name: "message", Shorthand: "m", Usage: "new message"},
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {
diff --git a/internal/cli/history.go b/internal/cli/history.go
index 2dd7002..1c93ee6 100644
--- a/internal/cli/history.go
+++ b/internal/cli/history.go
@@ -25,8 +25,8 @@ var historyCmd = LeafCommand{
 	Use:   "history",
 	Short: "Show a chronological feed of all recorded activity",
 	StrFlags: []StringFlag{
-		{Name: "project", Usage: "filter by project name or ID"},
-		{Name: "limit", Usage: "maximum number of entries to show (0 = all)", Default: "50"},
+		{Name: "project", Shorthand: "p", Usage: "filter by project name or ID"},
+		{Name: "limit", Shorthand: "l", Usage: "maximum number of entries to show (0 = all)", Default: "50"},
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		homeDir, err := os.UserHomeDir()
diff --git a/internal/cli/init.go b/internal/cli/init.go
index 0833ef7..e2d47d2 100644
--- a/internal/cli/init.go
+++ b/internal/cli/init.go
@@ -28,12 +28,12 @@ var initCmd = LeafCommand{
 	Use:   "init",
 	Short: "Initialize hourgit in a git repository",
 	StrFlags: []StringFlag{
-		{Name: "project", Usage: "assign repository to a project by name or ID (creates if needed)"},
+		{Name: "project", Shorthand: "p", Usage: "assign repository to a project by name or ID (creates if needed)"},
 	},
 	BoolFlags: []BoolFlag{
-		{Name: "force", Usage: "overwrite existing post-checkout hook"},
-		{Name: "merge", Usage: "append to existing post-checkout hook"},
-		{Name: "yes", Usage: "skip confirmation prompt"},
+		{Name: "force", Shorthand: "f", Usage: "overwrite existing post-checkout hook"},
+		{Name: "merge", Shorthand: "m", Usage: "append to existing post-checkout hook"},
+		{Name: "yes", Shorthand: "y", Usage: "skip confirmation prompt"},
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		dir, err := os.Getwd()
diff --git a/internal/cli/log.go b/internal/cli/log.go
index 49e4b9c..46aa644 100644
--- a/internal/cli/log.go
+++ b/internal/cli/log.go
@@ -17,15 +17,15 @@ var logCmd = LeafCommand{
 	Short: "Log time manually for a project",
 	Args:  cobra.MaximumNArgs(1),
 	BoolFlags: []BoolFlag{
-		{Name: "yes", Usage: "skip confirmation prompts"},
+		{Name: "yes", Shorthand: "y", Usage: "skip confirmation prompts"},
 	},
 	StrFlags: []StringFlag{
-		{Name: "project", Usage: "project name or ID (auto-detected from repo if omitted)"},
-		{Name: "duration", Usage: "duration to log (e.g. 30m, 3h, 3h30m)"},
-		{Name: "from", Usage: "start time (e.g. 9am, 14:00)"},
-		{Name: "to", Usage: "end time (e.g. 5pm, 17:00)"},
-		{Name: "date", Usage: "date to log for (YYYY-MM-DD, default: today)"},
-		{Name: "task", Usage: "task label for this entry"},
+		{Name: "project", Shorthand: "p", Usage: "project name or ID (auto-detected from repo if omitted)"},
+		{Name: "duration", Shorthand: "d", Usage: "duration to log (e.g. 30m, 3h, 3h30m)"},
+		{Name: "from", Shorthand: "F", Usage: "start time (e.g. 9am, 14:00)"},
+		{Name: "to", Shorthand: "T", Usage: "end time (e.g. 5pm, 17:00)"},
+		{Name: "date", Shorthand: "D", Usage: "date to log for (YYYY-MM-DD, default: today)"},
+		{Name: "task", Shorthand: "t", Usage: "task label for this entry"},
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		homeDir, repoDir, err := getContextPaths()
diff --git a/internal/cli/project_assign.go b/internal/cli/project_assign.go
index 2433b91..127df94 100644
--- a/internal/cli/project_assign.go
+++ b/internal/cli/project_assign.go
@@ -15,8 +15,8 @@ var projectAssignCmd = LeafCommand{
 	Short: "Assign repository to a project",
 	Args:  cobra.ExactArgs(1),
 	BoolFlags: []BoolFlag{
-		{Name: "force", Usage: "reassign repository to a different project"},
-		{Name: "yes", Usage: "skip confirmation prompt"},
+		{Name: "force", Shorthand: "f", Usage: "reassign repository to a different project"},
+		{Name: "yes", Shorthand: "y", Usage: "skip confirmation prompt"},
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		dir, err := os.Getwd()
diff --git a/internal/cli/project_remove.go b/internal/cli/project_remove.go
index 363470a..fa948b2 100644
--- a/internal/cli/project_remove.go
+++ b/internal/cli/project_remove.go
@@ -14,7 +14,7 @@ var projectRemoveCmd = LeafCommand{
 	Short: "Remove a project and clean up its repository assignments",
 	Args:  cobra.ExactArgs(1),
 	BoolFlags: []BoolFlag{
-		{Name: "yes", Usage: "skip confirmation prompt"},
+		{Name: "yes", Shorthand: "y", Usage: "skip confirmation prompt"},
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		homeDir, err := os.UserHomeDir()
diff --git a/internal/cli/remove.go b/internal/cli/remove.go
index 878d49f..d03421b 100644
--- a/internal/cli/remove.go
+++ b/internal/cli/remove.go
@@ -13,10 +13,10 @@ var removeCmd = LeafCommand{
 	Short: "Remove a log or checkout entry",
 	Args:  cobra.ExactArgs(1),
 	BoolFlags: []BoolFlag{
-		{Name: "yes", Usage: "skip confirmation prompt"},
+		{Name: "yes", Shorthand: "y", Usage: "skip confirmation prompt"},
 	},
 	StrFlags: []StringFlag{
-		{Name: "project", Usage: "project name or ID (auto-detected from repo if omitted)"},
+		{Name: "project", Shorthand: "p", Usage: "project name or ID (auto-detected from repo if omitted)"},
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		homeDir, repoDir, err := getContextPaths()
diff --git a/internal/cli/report.go b/internal/cli/report.go
index 6fd1c82..075f604 100644
--- a/internal/cli/report.go
+++ b/internal/cli/report.go
@@ -31,11 +31,11 @@ var reportCmd = LeafCommand{
 	Use:   "report",
 	Short: "Generate a monthly time report",
 	StrFlags: []StringFlag{
-		{Name: "month", Usage: "month number 1-12 (default: current month)"},
-		{Name: "week", Usage: "ISO week number 1-53 (default: current week)"},
-		{Name: "year", Usage: "year (complementary to --month or --week)"},
-		{Name: "project", Usage: "project name or ID (auto-detected from repo if omitted)"},
-		{Name: "export", Usage: "export format (pdf)"},
+		{Name: "month", Shorthand: "m", Usage: "month number 1-12 (default: current month)"},
+		{Name: "week", Shorthand: "w", Usage: "ISO week number 1-53 (default: current week)"},
+		{Name: "year", Shorthand: "y", Usage: "year (complementary to --month or --week)"},
+		{Name: "project", Shorthand: "p", Usage: "project name or ID (auto-detected from repo if omitted)"},
+		{Name: "export", Shorthand: "e", Usage: "export format (pdf)"},
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		homeDir, repoDir, err := getContextPaths()
diff --git a/internal/cli/report_test.go b/internal/cli/report_test.go
index aa8cb77..c48c2af 100644
--- a/internal/cli/report_test.go
+++ b/internal/cli/report_test.go
@@ -281,11 +281,11 @@ func execReportWithExport(t *testing.T, homeDir, repoDir, monthFlag, weekFlag, y
 		Use:   "report",
 		Short: "Generate a monthly time report",
 		StrFlags: []StringFlag{
-			{Name: "month", Usage: "month number 1-12 (default: current)"},
-			{Name: "week", Usage: "ISO week number"},
-			{Name: "year", Usage: "year"},
-			{Name: "project", Usage: "project name or ID"},
-			{Name: "export", Usage: "export format (pdf)"},
+			{Name: "month", Shorthand: "m", Usage: "month number 1-12 (default: current)"},
+			{Name: "week", Shorthand: "w", Usage: "ISO week number"},
+			{Name: "year", Shorthand: "y", Usage: "year"},
+			{Name: "project", Shorthand: "p", Usage: "project name or ID"},
+			{Name: "export", Shorthand: "e", Usage: "export format (pdf)"},
 		},
 		RunE: func(c *cobra.Command, args []string) error {
 			ef, _ := c.Flags().GetString("export")
@@ -398,6 +398,39 @@ func TestReportExportFlag_UnsupportedFormat(t *testing.T) {
 	assert.Contains(t, err.Error(), "unsupported export format")
 }
 
+func TestReportShortFlags(t *testing.T) {
+	homeDir, repoDir, _ := setupReportTest(t)
+
+	stdout := new(bytes.Buffer)
+	cmd := LeafCommand{
+		Use:   "report",
+		Short: "Generate a time report",
+		StrFlags: []StringFlag{
+			{Name: "month", Shorthand: "m", Usage: "month number 1-12"},
+			{Name: "week", Shorthand: "w", Usage: "ISO week number"},
+			{Name: "year", Shorthand: "y", Usage: "year"},
+			{Name: "project", Shorthand: "p", Usage: "project name or ID"},
+			{Name: "export", Shorthand: "e", Usage: "export format"},
+		},
+		RunE: func(c *cobra.Command, args []string) error {
+			mf, _ := c.Flags().GetString("month")
+			wf, _ := c.Flags().GetString("week")
+			yf, _ := c.Flags().GetString("year")
+			mc := c.Flags().Changed("month")
+			wc := c.Flags().Changed("week")
+			yc := c.Flags().Changed("year")
+			return runReport(c, homeDir, repoDir, "", mf, wf, yf, "", mc, wc, yc, fixedNow)
+		},
+	}.Build()
+
+	cmd.SetOut(stdout)
+	cmd.SetArgs([]string{"-m", "6", "-y", "2025"})
+
+	err := cmd.Execute()
+	require.NoError(t, err)
+	assert.Contains(t, stdout.String(), "No time entries")
+}
+
 func TestReportRegisteredAsSubcommand(t *testing.T) {
 	root := newRootCmd()
 	names := make([]string, len(root.Commands()))
diff --git a/internal/cli/status.go b/internal/cli/status.go
index f31648d..19979c8 100644
--- a/internal/cli/status.go
+++ b/internal/cli/status.go
@@ -18,7 +18,7 @@ var statusCmd = LeafCommand{
 	Use:   "status",
 	Short: "Show current tracking status",
 	StrFlags: []StringFlag{
-		{Name: "project", Usage: "project name or ID"},
+		{Name: "project", Shorthand: "p", Usage: "project name or ID"},
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		homeDir, repoDir, err := getContextPaths()
diff --git a/internal/cli/sync.go b/internal/cli/sync.go
index d97ca0b..af374fc 100644
--- a/internal/cli/sync.go
+++ b/internal/cli/sync.go
@@ -35,7 +35,7 @@ var syncCmd = LeafCommand{
 	Use:   "sync",
 	Short: "Sync branch checkouts from git reflog",
 	StrFlags: []StringFlag{
-		{Name: "project", Usage: "project name or ID (auto-detected from repo if omitted)"},
+		{Name: "project", Shorthand: "p", Usage: "project name or ID (auto-detected from repo if omitted)"},
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		homeDir, repoDir, err := getContextPaths()
diff --git a/web/docs/commands/defaults.md b/web/docs/commands/defaults.md
index b23e47b..68cf0ac 100644
--- a/web/docs/commands/defaults.md
+++ b/web/docs/commands/defaults.md
@@ -28,7 +28,7 @@ hourgit defaults reset [--yes]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--yes` | `false` | Skip confirmation prompt |
+| `-y`, `--yes` | `false` | Skip confirmation prompt |
 
 ## `hourgit defaults report`
 
@@ -40,5 +40,5 @@ hourgit defaults report [--month <1-12>] [--year <YYYY>]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--month` | current month | Month number 1-12 |
-| `--year` | current year | Year |
+| `-m`, `--month` | current month | Month number 1-12 |
+| `-y`, `--year` | current year | Year |
diff --git a/web/docs/commands/project-management.md b/web/docs/commands/project-management.md
index e3a2fca..d991172 100644
--- a/web/docs/commands/project-management.md
+++ b/web/docs/commands/project-management.md
@@ -20,8 +20,8 @@ hourgit project assign <name> [--force] [--yes]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--force` | `false` | Reassign repository to a different project |
-| `--yes` | `false` | Skip confirmation prompt |
+| `-f`, `--force` | `false` | Reassign repository to a different project |
+| `-y`, `--yes` | `false` | Skip confirmation prompt |
 
 ## `hourgit project list`
 
@@ -41,4 +41,4 @@ hourgit project remove <name> [--yes]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--yes` | `false` | Skip confirmation prompt |
+| `-y`, `--yes` | `false` | Skip confirmation prompt |
diff --git a/web/docs/commands/schedule.md b/web/docs/commands/schedule.md
index c64cb78..baf3845 100644
--- a/web/docs/commands/schedule.md
+++ b/web/docs/commands/schedule.md
@@ -12,7 +12,7 @@ hourgit config get [--project <name>]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--project` | auto-detect | Project name or ID |
+| `-p`, `--project` | auto-detect | Project name or ID |
 
 ## `hourgit config set`
 
@@ -24,7 +24,7 @@ hourgit config set [--project <name>]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--project` | auto-detect | Project name or ID |
+| `-p`, `--project` | auto-detect | Project name or ID |
 
 The interactive editor lets you define:
 - **Recurring** schedules — repeats on a regular pattern (e.g., every weekday)
@@ -43,8 +43,8 @@ hourgit config reset [--project <name>] [--yes]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--project` | auto-detect | Project name or ID |
-| `--yes` | `false` | Skip confirmation prompt |
+| `-p`, `--project` | auto-detect | Project name or ID |
+| `-y`, `--yes` | `false` | Skip confirmation prompt |
 
 ## `hourgit config report`
 
@@ -56,6 +56,6 @@ hourgit config report [--project <name>] [--month <1-12>] [--year <YYYY>]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--project` | auto-detect | Project name or ID |
-| `--month` | current month | Month number 1-12 |
-| `--year` | current year | Year |
+| `-p`, `--project` | auto-detect | Project name or ID |
+| `-m`, `--month` | current month | Month number 1-12 |
+| `-y`, `--year` | current year | Year |
diff --git a/web/docs/commands/shell-completions.md b/web/docs/commands/shell-completions.md
index 1a77489..74aedff 100644
--- a/web/docs/commands/shell-completions.md
+++ b/web/docs/commands/shell-completions.md
@@ -12,7 +12,7 @@ hourgit completion install [SHELL] [--yes]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--yes` | `false` | Skip confirmation prompt |
+| `-y`, `--yes` | `false` | Skip confirmation prompt |
 
 Shell completions are also offered automatically during `hourgit init`.
 
diff --git a/web/docs/commands/time-tracking.md b/web/docs/commands/time-tracking.md
index 1440f3b..23e3743 100644
--- a/web/docs/commands/time-tracking.md
+++ b/web/docs/commands/time-tracking.md
@@ -12,10 +12,10 @@ hourgit init [--project <name>] [--force] [--merge] [--yes]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--project` | auto-detect | Assign repository to a project by name or ID (creates if needed) |
-| `--force` | `false` | Overwrite existing post-checkout hook |
-| `--merge` | `false` | Append to existing post-checkout hook |
-| `--yes` | `false` | Skip confirmation prompt |
+| `-p`, `--project` | auto-detect | Assign repository to a project by name or ID (creates if needed) |
+| `-f`, `--force` | `false` | Overwrite existing post-checkout hook |
+| `-m`, `--merge` | `false` | Append to existing post-checkout hook |
+| `-y`, `--yes` | `false` | Skip confirmation prompt |
 
 ## `hourgit log`
 
@@ -27,12 +27,12 @@ hourgit log [MESSAGE] [--duration <dur>] [--from <time>] [--to <time>] [--date <
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--project` | auto-detect | Project name or ID |
-| `--duration` | — | Duration to log (e.g. `30m`, `3h`, `1d3h30m`) |
-| `--from` | — | Start time (e.g. `9am`, `14:00`) |
-| `--to` | — | End time (e.g. `5pm`, `17:00`) |
-| `--date` | today | Date to log for (`YYYY-MM-DD`) |
-| `--task` | — | Task label for this entry |
+| `-p`, `--project` | auto-detect | Project name or ID |
+| `-d`, `--duration` | — | Duration to log (e.g. `30m`, `3h`, `1d3h30m`) |
+| `-F`, `--from` | — | Start time (e.g. `9am`, `14:00`) |
+| `-T`, `--to` | — | End time (e.g. `5pm`, `17:00`) |
+| `-D`, `--date` | today | Date to log for (`YYYY-MM-DD`) |
+| `-t`, `--task` | — | Task label for this entry |
 
 > `--duration` and `--from`/`--to` are mutually exclusive. A message is always required (prompted if not provided).
 
@@ -63,13 +63,14 @@ hourgit edit <hash> [--duration <dur>] [--from <time>] [--to <time>] [--date <da
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--project` | auto-detect | Project name or ID |
-| `--duration` | — | New duration (e.g. `30m`, `3h`, `3h30m`) |
-| `--from` | — | New start time (e.g. `9am`, `14:00`) |
-| `--to` | — | New end time (e.g. `5pm`, `17:00`) |
-| `--date` | — | New date (`YYYY-MM-DD`) |
-| `--task` | — | New task label (empty string clears it) |
+| `-p`, `--project` | auto-detect | Project name or ID |
+| `-d`, `--duration` | — | New duration (e.g. `30m`, `3h`, `3h30m`) |
+| `-F`, `--from` | — | New start time (e.g. `9am`, `14:00`) |
+| `-T`, `--to` | — | New end time (e.g. `5pm`, `17:00`) |
+| `-D`, `--date` | — | New date (`YYYY-MM-DD`) |
+| `-t`, `--task` | — | New task label (empty string clears it) |
 | `-m`, `--message` | — | New message |
+| `-y`, `--yes` | `false` | Skip confirmation prompt |
 
 > `--duration` and `--from`/`--to` are mutually exclusive. Entry ID and creation timestamp are preserved.
 
@@ -93,8 +94,8 @@ hourgit remove <hash> [--project <name>] [--yes]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--project` | auto-detect | Project name or ID |
-| `--yes` | `false` | Skip confirmation prompt |
+| `-p`, `--project` | auto-detect | Project name or ID |
+| `-y`, `--yes` | `false` | Skip confirmation prompt |
 
 > Works with both log and checkout entries. Shows entry details and asks for confirmation before deleting.
 
@@ -108,7 +109,7 @@ hourgit sync [--project <name>]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--project` | auto-detect | Project name or ID |
+| `-p`, `--project` | auto-detect | Project name or ID |
 
 ## `hourgit report`
 
@@ -120,11 +121,11 @@ hourgit report [--month <1-12>] [--week <1-53>] [--year <YYYY>] [--project <name
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--month` | current month | Month number 1-12 |
-| `--week` | — | ISO week number 1-53 |
-| `--year` | current year | Year |
-| `--project` | auto-detect | Project name or ID |
-| `--export` | — | Export format (`pdf`); auto-generates filename |
+| `-m`, `--month` | current month | Month number 1-12 |
+| `-w`, `--week` | — | ISO week number 1-53 |
+| `-y`, `--year` | current year | Year |
+| `-p`, `--project` | auto-detect | Project name or ID |
+| `-e`, `--export` | — | Export format (`pdf`); auto-generates filename |
 
 > `--month` and `--week` cannot be used together.
 
@@ -159,8 +160,8 @@ hourgit history [--project <name>] [--limit <N>]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--project` | all projects | Filter by project name or ID |
-| `--limit` | `50` | Maximum number of entries to show (use `0` for all) |
+| `-p`, `--project` | all projects | Filter by project name or ID |
+| `-l`, `--limit` | `50` | Maximum number of entries to show (use `0` for all) |
 
 ## `hourgit status`
 
@@ -172,7 +173,7 @@ hourgit status [--project <name>]
 
 | Flag | Default | Description |
 |------|---------|-------------|
-| `--project` | auto-detect | Project name or ID |
+| `-p`, `--project` | auto-detect | Project name or ID |
 
 **Output includes:**