From 30953a70b6ada77d0b81b73377bcb78dfd8b8917 Mon Sep 17 00:00:00 2001
From: Sergio Gasquez Arcos <sergio.gasquez@gmail.com>
Date: Tue, 28 Jan 2025 14:44:04 +0100
Subject: [PATCH] [cargo-espflash]: Fix `-s` collision (#731)

* fix: `-s` collision

* docs: Update changelog
---
 CHANGELOG.md               | 2 +-
 cargo-espflash/src/main.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fef4ab9..6485bae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,8 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 ### Fixed
-
 - Update the app image SHA in the correct location for padded images (#715)
+- Fix `-s` argument collision (#731)
 
 ### Removed
 
diff --git a/cargo-espflash/src/main.rs b/cargo-espflash/src/main.rs
index 1c1e363..8d49637 100644
--- a/cargo-espflash/src/main.rs
+++ b/cargo-espflash/src/main.rs
@@ -53,7 +53,7 @@ enum CargoSubcommand {
         subcommand: Commands,
 
         /// Do not check for updates
-        #[clap(short, long, global = true, action)]
+        #[clap(short = 'S', long, global = true, action)]
         skip_update_check: bool,
     },
 }