diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-03 11:01:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 11:01:22 -0700 |
| commit | 3a760cad7952ce5d17ff77a8f376aaa35299dfa7 (patch) | |
| tree | 42b5f7541479c4a798d90f2ffdf361edff5ffc66 /Documentation/config.txt | |
| parent | 720e20eb68a476d43e59b9bd568da6cc4932a5ef (diff) | |
| parent | 804098bb30a5339cccb0be981a3e876245aa0ae5 (diff) | |
| download | git-3a760cad7952ce5d17ff77a8f376aaa35299dfa7.tar.gz | |
Merge branch 'gr/rebase-i-drop-warn'
Add "drop commit-object-name subject" command as another way to
skip replaying of a commit in "rebase -i", and then punish those
who do not use it (and instead just remove the lines) by throwing
a warning.
* gr/rebase-i-drop-warn:
git rebase -i: add static check for commands and SHA-1
git rebase -i: warn about removed commits
git-rebase -i: add command "drop" to remove a commit
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 9358f4c16b..315f2710af 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2180,6 +2180,17 @@ rebase.autoStash:: 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 |