From 77e71cfcb194619be09c806f66cce04082ab8fc0 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 24 Mar 2019 17:12:36 +0100
Subject: [PATCH] completions/git: Handle AM files

Fixes #5763.

[ci skip]
---
 share/completions/git.fish | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 98e0c30a7..6293142e7 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -190,6 +190,15 @@ function __fish_git_files
                     set -ql added
                     and set file "$line[9..-1]"
                     and set desc $added_desc
+                case "1 AM*"
+                    # Added files with additional modifications
+                    if set -ql added
+                        set file "$line[9..-1]"
+                        set desc $added_desc
+                    else if set -ql modified
+                        set file "$line[9..-1]"
+                        set desc $modified_desc
+                    end
                 case '1 .M*'
                     # Modified
                     # From the docs: "Ordinary changed entries have the following format:"