Merge branch 'nv/commit-gpgsign-config'

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 10bf318d0d4ecc03dcf52d3f665410c48d26bdfd..43c19e0829ca727501ba7e4d29c952bc286ccb77 100644 (file)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -1,11 +1,8 @@
-#!/bin/sh
+# This shell script fragment is sourced by git-rebase to implement
+# its interactive mode.  "git rebase --interactive" makes it easy
+# to fix up commits in the middle of a series and rearrange commits.
 #
 # Copyright (c) 2006 Johannes E. Schindelin
-
-# SHORT DESCRIPTION
-#
-# This script makes it easy to fix up commits in the middle of a series,
-# and rearrange commits.
 #
 # The original idea comes from Eric W. Biederman, in
 # http://article.gmane.org/gmane.comp.version-control.git/22407
@@ -713,7 +710,7 @@ expand_todo_ids() {
 }
 
 collapse_todo_ids() {
-       transform_todo_ids --short=7
+       transform_todo_ids --short
 }
 
 # Rearrange the todo list that has both "pick sha1 msg" and