diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-03 18:01:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 18:01:16 (GMT) |
| commit | 9f56db7cafc6a4634b8f2fa70f1c8949f4242df1 (patch) | |
| tree | fd06c818321ff5a01174b2ce7bd5c25cafa529c5 /Documentation | |
| parent | 8f50e2eef794bf8be4705738756c00c39042db03 (diff) | |
| parent | 16cf51c7a2e82f27577bb1bdcdc013c34815803e (diff) | |
| download | git-9f56db7cafc6a4634b8f2fa70f1c8949f4242df1.zip git-9f56db7cafc6a4634b8f2fa70f1c8949f4242df1.tar.gz git-9f56db7cafc6a4634b8f2fa70f1c8949f4242df1.tar.bz2 | |
Merge branch 'mr/rebase-i-customize-insn-sheet'
"git rebase -i"'s list of todo is made configurable.
* mr/rebase-i-customize-insn-sheet:
git-rebase--interactive.sh: add config option for custom instruction format
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 5 | ||||
| -rw-r--r-- | Documentation/git-rebase.txt | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 43bb53c..75c3722 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2161,6 +2161,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 diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 1d01baa..7dc613c 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:: |