From 469c28eae8277dce9807fde9c31dbcbe30b01240 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pyapar@gmail.com>
Date: Tue, 20 Nov 2018 23:07:16 +0330
Subject: [PATCH] [skip ci] add commits instructions

---
 scripts/commits | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/commits b/scripts/commits
index ab84c79f05..f161b0268a 100755
--- a/scripts/commits
+++ b/scripts/commits
@@ -4,6 +4,8 @@
 
 latestTag=`git describe | grep -oE "^[^-]+"`
 
+echo "Comaparing $latestTag...dev"
+
 diff=`git --no-pager log $latestTag...dev --pretty="%s (%an) (%h)"`
 
 echo
@@ -15,3 +17,10 @@ echo
 echo "# Fixes"
 echo "$diff" | awk '!/feat/'
 echo "$diff" | awk '!/feat/' | grep -oE "[0-9a-f]{8}" > .git/fix.txt
+
+echo
+echo "To apply diff into target banch:"
+echo "$ git cherry-pick \`tac .git/fix.txt\`"
+echo "In case of conflicts:"
+echo "$ yarn"
+echo "$ git cherry-pick --continue"