diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-08-09 13:05:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-09 13:05:47 -0700 |
| commit | 0d0ba03a18a9c6cbc3d55c1b6834b9c3824f823f (patch) | |
| tree | 3266384afc1dc4717f49b1bd77f9ab734cacf8a0 /git-rebase.sh | |
| parent | Merge branch 'webrick' of git://git.bogomips.org/git-svn (diff) | |
| parent | gitweb: clarify search results page when no matching commit found (diff) | |
| download | tgif-0d0ba03a18a9c6cbc3d55c1b6834b9c3824f823f.tar.xz | |
Merge branch 'maint'
* maint:
gitweb: clarify search results page when no matching commit found
Documentation: add a FILES section for show-ref
Makefile: add missing dependency on http.h
Makefile: add missing dependencies on url.h
Documentation/git-log: Clarify --full-diff
git-rebase: fix typo when parsing --force-rebase
imap-send: Fix sprintf usage
prune: allow --dry-run for -n and --verbose for -v
notes: allow --dry-run for -n and --verbose for -v
Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -C
Documentation: cite git-am from git-apply
t7003: fix subdirectory-filter test
Allow "check-ref-format --branch" from subdirectory
check-ref-format: handle subcommands in separate functions
pretty-options.txt: match --format's documentation with implementation.
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 2d88742cec..1d38afdb10 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -346,7 +346,7 @@ do --root) rebase_root=t ;; - -f|--f|--fo|--for|--forc|force|--force-r|--force-re|--force-reb|--force-reba|--force-rebas|--force-rebase|--no-ff) + -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) |