diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-12-27 11:16:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-27 11:16:21 -0800 |
| commit | 0da2ba4880f971de2782f2d4cfcd68f9148d2860 (patch) | |
| tree | 9b41bf3307485678a5f8e6932dc90bd0349e539b /Documentation/config.txt | |
| parent | 720b1764def1cfd67004d917ec954df20983e6bb (diff) | |
| parent | ee5462d6e71aad04628ccb8f078784468bfa4139 (diff) | |
| download | git-0da2ba4880f971de2782f2d4cfcd68f9148d2860.tar.gz git-0da2ba4880f971de2782f2d4cfcd68f9148d2860.tar.xz | |
Merge branch 'lb/rebase-i-short-command-names'
With a configuration variable rebase.abbreviateCommands set,
"git rebase -i" produces the todo list with a single-letter
command names.
* lb/rebase-i-short-command-names:
sequencer.c: drop 'const' from function return type
t3404: add test case for abbreviated commands
rebase -i: learn to abbreviate command names
rebase -i -x: add exec commands via the rebase--helper
rebase -i: update functions to use a flags parameter
rebase -i: replace reference to sha1 with oid
rebase -i: refactor transform_todo_ids
rebase -i: set commit to null in exec commands
Documentation: use preferred name for the 'todo list' script
Documentation: move rebase.* configs to new file
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 b18c0f97f..7814fb904 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2736,36 +2736,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 |