diff --git a/app/src/main/java/org/yuemi/commands/subcommands/GitCommitSubcommand.java b/app/src/main/java/org/yuemi/commands/subcommands/GitCommitSubcommand.java
index 19a917c..e99da0a 100644
--- a/app/src/main/java/org/yuemi/commands/subcommands/GitCommitSubcommand.java
+++ b/app/src/main/java/org/yuemi/commands/subcommands/GitCommitSubcommand.java
@@ -21,14 +21,23 @@ public class GitCommitSubcommand implements SubcommandExecutor {
             File repoFolder = new File(".");
             String message = "Commit from Minecraft";
 
-            for (String arg : args) {
+            for (int i = 0; i < args.length; i++) {
+                String arg = args[i];
                 if (arg.startsWith("--path=")) {
                     repoFolder = new File(arg.substring("--path=".length()));
-                } else if (arg.startsWith("--message=") || arg.startsWith("-m=")) {
-                    message = arg.contains("=") ? arg.split("=", 2)[1] : message;
+                } else if (arg.startsWith("--message=")) {
+                    message = arg.substring("--message=".length());
+                } else if (arg.equals("-m") && i + 1 < args.length) {
+                    message = args[i + 1];
+                    i++; // Skip next token
                 }
             }
 
+            if (message.length() > 50) {
+                sender.sendMessage("§cCommit message must not exceed 50 characters.");
+                return;
+            }
+
             try {
                 GitManager git = new GitManager(repoFolder);
                 git.commit(message);