Skip to content

Commit 3bc5eaa

Browse files
committed
Added notes to commit message change command in ezk.git
1 parent 5483df2 commit 3bc5eaa

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

EasyKey.git/ezk-git-functions.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,15 @@ ammendCommit() {
389389
echo "Your branch is behind remote branch! Update first using git pull."
390390
return
391391
fi
392-
coloredLog " DO NOT DO THIS IN SHARED BRANCHES ! " "$clrPurple" "$clrWhite" && printf "\n\r"
392+
coloredLog " BE CAREFULL IN SHARED BRANCHES ! " "$clrPurple" "$clrWhite" && printf "\n\r"
393+
echo
394+
echo "If you do this in shared branches, and you have pushed the commits to remote repo already,"
395+
echo "some developers might have the commit object your going to change as predecessor to their"
396+
echo "commits. Actually you will replace that object with a new one. This changes the commit "
397+
echo "history which can result in conflicts."
398+
echo
399+
echo "If you are the only developer working in that branch, the change is NOT critical."
400+
echo
393401
echo -n "Change some commit messages (y/n)?" && wait_for_keypress && echo
394402
[ "${REPLY}" != "y" ] && waitonexit && return
395403
git rebase -i HEAD~1

0 commit comments

Comments
 (0)