diff options
| author | Michael Rappazzo <rappazzo@gmail.com> | 2015-06-13 12:26:58 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-15 11:42:58 -0700 |
| commit | 16cf51c7a2e82f27577bb1bdcdc013c34815803e (patch) | |
| tree | 3401b5762913fc10a6297ec6ca4511f7df4e12b0 /Documentation/git-rebase.txt | |
| parent | 7974889a053574e449b55ca543a486e38e74864f (diff) | |
| download | git-16cf51c7a2e82f27577bb1bdcdc013c34815803e.tar.gz | |
git-rebase--interactive.sh: add config option for custom instruction formatmr/rebase-i-customize-insn-sheet
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 <rappazzo@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 1d01baa5fc..7dc613cf3e 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -213,6 +213,9 @@ rebase.autoSquash:: rebase.autoStash:: If set to true enable '--autostash' option by default. +rebase.instructionFormat:: + Custom commit list format to use during an '--interactive' rebase. + OPTIONS ------- --onto <newbase>:: @@ -359,6 +362,10 @@ default is `--no-fork-point`, otherwise the default is `--fork-point`. Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below). ++ +The commit list format can be changed by setting the configuration option +rebase.instructionFormat. A customized instruction format will automatically +have the long commit hash prepended to the format. -p:: --preserve-merges:: |