We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 4a1c85c commit 4d82379Copy full SHA for 4d82379
EasyKey.git/ezk-git-functions.sh
@@ -81,7 +81,7 @@ function mergeChanges () {
81
echo "... nothing to merge ..."
82
elif [ $behind_count -gt 0 ]; then
83
echo "Your current branch '$current_branch' is behind of its remote counterpart."
84
- coloredLog " MERGE RECOMMENDED " "$clrPurple" "$clrWhite"
+ coloredLog " MERGE RECOMMENDED " "$clrPurple" "$clrWhite" && printf "\n\r"
85
diffDrillDownAdvanced "git diff --name-status origin/$actual $actual" "awk '{print \$2}'" "origin/$actual" "$actual"
86
executeCommand "git diff --name-status origin/$actual $actual"
87
read -p "Merge (y/n)? " -n 1 -r
0 commit comments