File tree Expand file tree Collapse file tree 2 files changed +2
-2
lines changed Expand file tree Collapse file tree 2 files changed +2
-2
lines changed Original file line number Diff line number Diff line change 2
2
3
3
# git squash [ ![ Maintenance] ( https://img.shields.io/maintenance/yes/2020.svg?maxAge=2592000 )] ( )
4
4
5
- Locally squash commits on a branch without needing to resolve any conflicts.
5
+ Locally squash commits on a branch without resolving any conflicts.
6
6
7
7
It works just like GitHub's "Squash and merge" or GitLab's "Squash commits".
8
8
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ if ! git show-ref "$1" > /dev/null; then
25
25
exit 1
26
26
fi
27
27
28
- FIRST_COMMIT_ID=$( git log master .. --no-merges --pretty=format:%h | tail -1)
28
+ FIRST_COMMIT_ID=$( git log $1 .. --no-merges --pretty=format:%h | tail -1)
29
29
30
30
if [ " $FIRST_COMMIT_ID " == " " ]; then
31
31
echo " There are no changes to be squashed"
You can’t perform that action at this time.
0 commit comments