diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-03-07 14:22:03 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-03-07 14:22:03 +0000 |
| commit | 5ebe69f6e961305a63a8fd07b62bc5c0011c123a (patch) | |
| tree | c1b219ac7b8ebc272a6a4b9e4a391bf1371c35b5 | |
| parent | cf710d94046fc2063164a2fbcb0add48800cd4dd (diff) | |
fsfmerge.sh: Clarify user instructions
Change-Id: Iff2336e1b6df8ffbba2268675d05500a552e2c4b
| -rwxr-xr-x | fsfmerge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fsfmerge.sh b/fsfmerge.sh index e484fa4..dc9f1a4 100755 --- a/fsfmerge.sh +++ b/fsfmerge.sh @@ -32,7 +32,7 @@ MSHA1=$(git log -n 1 --format="%h" origin/$BRANCH) MREV=${MREV##*@} MREV=${MREV%% *} -msg "Remove all rebase entries up to ${red}$BSHA1$\n" +msg "Remove all rebase entries up to and including ${red}$BSHA1$\n" msg "Keep first line as 'pick' and squash remaining ones (s/^pick/squash/)\n" msg "Last commit to merge should be ${red}$MSHA1$\n" msg "Branch merge commit message should be:\n" |