diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-04-03 12:28:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-03 12:28:44 -0700 |
| commit | 9234b003726556e0d3d0ea8ade97dc9f7bd50a6e (patch) | |
| tree | 194e8895d8a2e7c7dba0f5e6ab9108231aaae711 /git-rebase.sh | |
| parent | 7b1cb5c40ebb57c5a26f1335807be24dba8d4518 (diff) | |
| parent | b499549401cb2b1f6c30d09681380fd519938eb0 (diff) | |
| download | git-9234b003726556e0d3d0ea8ade97dc9f7bd50a6e.tar.gz git-9234b003726556e0d3d0ea8ade97dc9f7bd50a6e.tar.xz | |
Merge branch 'mb/rebase-i-no-ff'
* mb/rebase-i-no-ff:
Teach rebase the --no-ff option.
Conflicts:
git-rebase--interactive.sh
t/t3404-rebase-interactive.sh
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index e0eb9568f..44f5c65fd 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -3,7 +3,7 @@ # Copyright (c) 2005 Junio C Hamano. # -USAGE='[--interactive | -i] [-v] [--force-rebase | -f] [--onto <newbase>] [<upstream>|--root] [<branch>] [--quiet | -q]' +USAGE='[--interactive | -i] [-v] [--force-rebase | -f] [--no-ff] [--onto <newbase>] [<upstream>|--root] [<branch>] [--quiet | -q]' LONG_USAGE='git-rebase replaces <branch> with a new branch of the same name. When the --onto option is provided the new branch starts out with a HEAD equal to <newbase>, otherwise it is equal to <upstream> @@ -353,7 +353,7 @@ do --root) rebase_root=t ;; - -f|--f|--fo|--for|--forc|force|--force-r|--force-re|--force-reb|--force-reba|--force-rebas|--force-rebase) + -f|--f|--fo|--for|--forc|force|--force-r|--force-re|--force-reb|--force-reba|--force-rebas|--force-rebase|--no-ff) force_rebase=t ;; --rerere-autoupdate|--no-rerere-autoupdate) |