contrib/completion: add smerge to the mergetool completion candidates

diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index 99b8c177875a7f26ae6c7f70be42c9d97231f7b9..6416716ee620cfac7803f9f00cef309a41b08f31 100644 (file)
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -36,7 +36,7 @@ rm -f "$GIT_DIR/rebased-patches"
 
 git format-patch -k --stdout --full-index --cherry-pick --right-only \
        --src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \
-       --pretty=mboxrd \
+       --pretty=mboxrd --topo-order \
        $git_format_patch_opt \
        "$revisions" ${restrict_revision+^$restrict_revision} \
        >"$GIT_DIR/rebased-patches"