diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-03 11:01:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 11:01:16 -0700 |
| commit | 9f56db7cafc6a4634b8f2fa70f1c8949f4242df1 (patch) | |
| tree | fd06c818321ff5a01174b2ce7bd5c25cafa529c5 /Documentation/config.txt | |
| parent | 8f50e2eef794bf8be4705738756c00c39042db03 (diff) | |
| parent | 16cf51c7a2e82f27577bb1bdcdc013c34815803e (diff) | |
| download | git-9f56db7cafc6a4634b8f2fa70f1c8949f4242df1.tar.gz git-9f56db7cafc6a4634b8f2fa70f1c8949f4242df1.tar.xz | |
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/config.txt')
| -rw-r--r-- | Documentation/config.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 43bb53c04..75c372238 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 |