diff options
| author | Liam Beguin <liambeguin@gmail.com> | 2017-12-03 22:17:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-04 17:02:21 (GMT) |
| commit | 946a9f20b46b6cf8fbfbcc69ed97182f8696bb8d (patch) | |
| tree | d8cc7dcfc08cf8bf6fef826affc10b409bb87f10 /Documentation/config.txt | |
| parent | 1a4e40aa5dc16564af879142ba9dfbbb88d1e5ff (diff) | |
| download | git-946a9f20b46b6cf8fbfbcc69ed97182f8696bb8d.zip git-946a9f20b46b6cf8fbfbcc69ed97182f8696bb8d.tar.gz git-946a9f20b46b6cf8fbfbcc69ed97182f8696bb8d.tar.bz2 | |
Documentation: move rebase.* configs to new file
Move all rebase.* configuration variables to a separate file in order to
remove duplicates, and include it in config.txt and git-rebase.txt. The
new descriptions are mostly taken from config.txt as they are more
verbose.
Signed-off-by: Liam Beguin <liambeguin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 531649c..e424b7d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2691,36 +2691,7 @@ push.recurseSubmodules:: is retained. You may override this configuration at time of push by specifying '--recurse-submodules=check|on-demand|no'. -rebase.stat:: - Whether to show a diffstat of what changed upstream since the last - rebase. False by default. - -rebase.autoSquash:: - If set to true enable `--autosquash` option by default. - -rebase.autoStash:: - When set to true, automatically create a temporary stash entry - before the operation begins, and apply it after the operation - ends. This means that you can run rebase on a dirty worktree. - However, use with care: the final stash application after a - successful rebase might result in non-trivial conflicts. - Defaults to false. - -rebase.missingCommitsCheck:: - If set to "warn", git rebase -i will print a warning if some - commits are removed (e.g. a line was deleted), however the - rebase will still proceed. If set to "error", it will print - the previous warning and stop the rebase, 'git rebase - --edit-todo' can then be used to correct the error. If set to - "ignore", no checking is done. - To drop a commit without warning or error, use the `drop` - command in the todo-list. - Defaults to "ignore". - -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. +include::rebase-config.txt[] receive.advertiseAtomic:: By default, git-receive-pack will advertise the atomic push |