summaryrefslogtreecommitdiff
path: root/Documentation/config
diff options
context:
space:
mode:
authorAlex Henrie <alexhenrie24@gmail.com>2021-02-23 07:18:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-02-24 19:49:10 (GMT)
commit2803d800d2268cde4b932fab38dffe6712d86d16 (patch)
treeaae5cf2cb87a03428119bcce9fbb63d1fd2e53db /Documentation/config
parent66e871b6647ffea61a77a0f82c7ef3415f1ee79c (diff)
downloadgit-2803d800d2268cde4b932fab38dffe6712d86d16.zip
git-2803d800d2268cde4b932fab38dffe6712d86d16.tar.gz
git-2803d800d2268cde4b932fab38dffe6712d86d16.tar.bz2
rebase: add a config option for --no-fork-point
Some users (myself included) would prefer to have this feature off by default because it can silently drop commits. Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config')
-rw-r--r--Documentation/config/rebase.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/config/rebase.txt b/Documentation/config/rebase.txt
index 7f7a07d..214f31b 100644
--- a/Documentation/config/rebase.txt
+++ b/Documentation/config/rebase.txt
@@ -68,3 +68,6 @@ rebase.rescheduleFailedExec::
Automatically reschedule `exec` commands that failed. This only makes
sense in interactive mode (or when an `--exec` option was provided).
This is the same as specifying the `--reschedule-failed-exec` option.
+
+rebase.forkPoint::
+ If set to false set `--no-fork-point` option by default.