diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-26 14:05:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-26 14:05:13 -0700 |
| commit | 57be46fd213b448f66b1470187109e7d6ad6f475 (patch) | |
| tree | 7b597a96f96d9ec65d4af995c0bfbc530be58e55 /Documentation | |
| parent | 07d68930c247325116ad4a63422eb1520aaf6ef8 (diff) | |
| parent | d5e673b60be2eb99153276366b6b5ff3277805df (diff) | |
| download | git-57be46fd213b448f66b1470187109e7d6ad6f475.tar.gz | |
Merge branch 'ew/rebase'
* ew/rebase:
rebase: allow --skip to work with --merge
rebase: cleanup rebasing with --merge
rebase: allow --merge option to handle patches merged upstream
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rebase.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index c339c4525c..9d7bcaa38c 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/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 |