summaryrefslogtreecommitdiff
path: root/GIT-VERSION-GEN
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder@ira.uka.de>2008-10-03 02:08:21 +0200
committerShawn O. Pearce <spearce@spearce.org>2008-10-02 19:23:55 -0700
commit7c4188360ac157217046dd99f4d98a4bf17907a8 (patch)
tree07224b425c0949ce092666c628119e4b7dcaa959 /GIT-VERSION-GEN
parent9a1fd653b13b6cc136bfa5b9563f629b2af1a6c8 (diff)
downloadgit-7c4188360ac157217046dd99f4d98a4bf17907a8.tar.gz
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 <szeder@ira.uka.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'GIT-VERSION-GEN')
0 files changed, 0 insertions, 0 deletions