The title is not exact, but I can\'t express it better in a single line.
git notes is the only way to have a different git log message (different than the commit message) without changing the SHA1, as mentioned in the "Notes to Self" article.
A few remarks though:
git notes
isn't working for you).refs/notes/*
)As various people have pointed out (e.g. in VonC's very useful answer), git notes
really is the mechanism you're looking for. Is it not enough for you to change your alias to the following?
git log --oneline --show-notes
Presumably it's only occasionally that you'll have to add a note to a commit, and the notes will visually stand out in the output of that command.
If you really want to replace the subject of each commit if notes exist, you could always create a script along the lines of:
for c in $(git rev-list HEAD)
do
n=$(git notes show $c 2> /dev/null)
m=$(git show --oneline $c|head -1)
if [ -n "$n" ]
then
m=${m/ */ $n}
fi
echo $m
done
... but that's a lot uglier for little gain, in my opinion.
Technically this seems impossible (at least to me, I'm not a git pro though).
A git commit stores a tree hash (think: the state of your working directory at that time) with additional commit information. When you change the commit message, the tree hash won't change, however the commit hash will change since it is computed from the commit object, there's no way around it.
See Progit internals for details.