Commits messages numbered only until 10 when squashed

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Git version: 2.11.0

THE CASE:
I have 15 commit to be squashed (the hashes are real, but the commit
messages were changed for privacy). When it's rebase interactively
squashing all the 15 commits, the numbering goes from 1 to 10 and
after it starts again from 1 to 5.

- The first line says "This is a combination of 5 commits" but the
real amount of commit is 15.
- #5 coincidentally is the last commit in the concatenated messages to
build the new commit message
- The order of the commit messages joined were: 1, 2, 3, 4, 5, 6, 7,
8, 9, 10, 1, 2, 3, 4, 5

WHAT WAS DONE ?
git rebase -i 4e4f37c3~1

pick 4e4f37c3
s 72742a70
s db800d70
s 2bcd475a
s 5e5eb85f
s 4422b1e5
s af19b0e2
s 3d64165b
s faeb2ce9
s c7dc6b38
s edeff8d9
s bd451d5b
s 851bf828
s 9cae1f95
s b79466fb


WHEN THE COMMIT MESSAGE IS EDITED: The commit hashes are real, but the
messages were changed for privacy.

# This is a combination of 5 commits.
# This is the 1st commit message:
Terminal redim Ok.

Fix #64

# This is the commit message #2:

Script improved.


# This is the commit message #3:

Added some environment variables.

# This is the commit message #4:

Improved the redim command.

# This is the commit message #5:

+Fix

# This is the commit message #6:

Fixed header and footer.

# This is the commit message #7:

+fix

# This is the commit message #8:

+fix

# This is the commit message #9:

+fix

# This is the commit message #10:

+fix

# This is the commit message #1:

+fix

# This is the commit message #2:

+fix

# This is the commit message #3:

Changed some environment variables.

# This is the commit message #4:

+fix

# This is the commit message #5:

+fix

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
...

------
Luciano Moreira



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]