git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9a1fd65)
rebase -i: proper prepare-commit-msg hook argument when squashing
authorSZEDER Gábor <redacted>
Fri, 3 Oct 2008 00:08:21 +0000 (02:08 +0200)
committerShawn O. Pearce <redacted>
Fri, 3 Oct 2008 02:23:55 +0000 (19:23 -0700)
commit7c4188360ac157217046dd99f4d98a4bf17907a8
tree07224b425c0949ce092666c628119e4b7dcaa959tree | snapshot
parent9a1fd653b13b6cc136bfa5b9563f629b2af1a6c8commit | diff
rebase -i: proper prepare-commit-msg hook argument when squashing

One would expect that the prepare-commit-msg hook gets 'squash' as the
second argument when squashing commits with 'rebase -i'.  However,
that was not the case, as it got 'merge' instead.  This patch fixes
the problem.

Signed-off-by: SZEDER Gábor <redacted>
Signed-off-by: Shawn O. Pearce <redacted>
git-rebase--interactive.sh diff | blob | history
git clone https://git.99rst.org/PROJECT