| commit | 7c4188360ac157217046dd99f4d98a4bf17907a8 | |
| author | SZEDER Gábor <szeder@ira.uka.de> | |
| Fri, 3 Oct 2008 00:08:21 +0000 (3 02:08 +0200) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 3 Oct 2008 02:23:55 +0000 (2 19:23 -0700) | ||
| tree | 07224b425c0949ce092666c628119e4b7dcaa959 | treesnapshot (tar.gz zip) |
| parent | 9a1fd653b13b6cc136bfa5b9563f629b2af1a6c8 | commitdiff |
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>
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>
| git-rebase--interactive.sh | diffblobblamehistory |