Merge pull request #15 from simahawk/master

shell_command_after: fix doc and add real life example

README.rst

@@ -125,7 +125,7 @@ the aggregated directory.
         merges:
             - oca 8.0
         target: acsone aggregated_branch_name
-            shell_command_after: echo 'my command'
+        shell_command_after: echo 'my command'
 
     ./connector-interfaces:
         remotes:
@@ -134,9 +134,23 @@ the aggregated directory.
         merges:
             - oca 9.0
         target: acsone aggregated_branch_name
-            shell_command_after:
-                - echo 'a first command'
-                - echo 'a second command'
+        shell_command_after:
+            - echo 'a first command'
+            - echo 'a second command'
+
+A real life example: applying a patch
+
+.. code-block:: yaml
+
+    ./odoo:
+        remotes:
+        oca: https://github.com/OCA/OCB.git
+        acsone: [email protected]/acsone/OCB.git
+        merges:
+            - oca 9.0
+        target: acsone aggregated_branch_name
+        shell_command_after:
+            - git am "$(git format-patch -1 XXXXXX -o ../patches)"
 
 Command line Usage
 ==================