From 16cf51c7a2e82f27577bb1bdcdc013c34815803e Mon Sep 17 00:00:00 2001 From: Michael Rappazzo Date: Sat, 13 Jun 2015 12:26:58 -0400 Subject: git-rebase--interactive.sh: add config option for custom instruction format A config option 'rebase.instructionFormat' can override the default 'oneline' format of the rebase instruction list. Since the list is parsed using the left, right or boundary mark plus the sha1, they are prepended to the instruction format. Signed-off-by: Michael Rappazzo Signed-off-by: Junio C Hamano --- Documentation/config.txt | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Documentation/config.txt') diff --git a/Documentation/config.txt b/Documentation/config.txt index 4d21ce1647..ad40cac508 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2160,6 +2160,11 @@ rebase.autoStash:: successful rebase might result in non-trivial conflicts. Defaults to false. +rebase.instructionFormat + A format string, as specified in linkgit:git-log[1], to be used for + the instruction list during an interactive rebase. The format will automatically + have the long commit hash prepended to the format. + receive.advertiseAtomic:: By default, git-receive-pack will advertise the atomic push capability to its clients. If you don't want to this capability -- cgit v1.2.1