diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-06-26 23:46:53 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-06-26 23:46:53 +0000 |
| commit | 3901ffb453101d619d2d19f531d2d05481a03751 (patch) | |
| tree | f9223d90d26da56307677c9a8772faaeac697cd4 /git-rebase.txt | |
| parent | 97f518c4cae23baaa8a9731a830793ae23f97fc7 (diff) | |
| download | git-htmldocs-3901ffb453101d619d2d19f531d2d05481a03751.tar.gz | |
Autogenerated HTML docs for v1.4.1-rc1-g1ef9
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index c339c4525..9d7bcaa38 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -108,7 +108,6 @@ OPTIONS --skip:: Restart the rebasing process by skipping the current patch. - This does not work with the --merge option. --merge:: Use merging strategies to rebase. When the recursive (default) merge |