Chris Webb df5df20c13 rebase -i: support --root without --onto ... Allow --root to be specified to rebase -i without --onto, making it possible to edit and re-order all commits right back to the root(s). If there is a conflict to be resolved when applying the first change, the user will expect a sane index and working tree to get sensible behaviour from git-diff and friends, so create a sentinel commit with an empty tree to rebase onto. Automatically squash the sentinel with any commits rebased directly onto it, so they end up as root commits in their own right and retain their authorship and commit message. Implicitly use rebase -i for non-interactive rebase of --root without an --onto argument now that rebase -i can correctly do this. Signed-off-by: Chris Webb <chris@arachsys.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2012-06-26 15:08:10 -07:00
..
RelNotes	Second batch for 1.7.12	2012-06-25 11:31:07 -07:00
howto	correct spelling: an URL -> a URL	2012-03-28 08:47:23 -07:00
pt_BR	…
technical	Merge branch 'mm/api-credentials-doc'	2012-06-12 08:40:16 -07:00
.gitattributes	…
.gitignore	…
CodingGuidelines	CodingGuidelines: do not use 'which' in shell scripts	2012-02-27 15:10:23 -08:00
Makefile	Merge branch 'jk/no-more-asciidoc7'	2012-06-25 11:24:10 -07:00
SubmittingPatches	…
asciidoc.conf	docs: always define git-relative-html-prefix attribute	2012-06-20 23:35:08 -07:00
blame-options.txt	…
build-docdep.perl	…
cat-texi.perl	…
cmd-list.perl	…
config.txt	Merge branch 'jk/doc-asciidoc-inline-literal' into maint	2012-05-14 11:43:04 -07:00
date-formats.txt	…
diff-config.txt	Documentation: spelling fixes	2012-06-19 11:35:19 -07:00
diff-format.txt	…
diff-generate-patch.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
diff-options.txt	Documentation: Fix misspellings	2012-06-22 14:25:04 -07:00
docbook-xsl.css	…
docbook.xsl	…
everyday.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
fetch-options.txt	…
fix-texi.perl	…
git-add.txt	…
git-am.txt	Merge branch 'jb/am-include'	2012-04-20 15:49:16 -07:00
git-annotate.txt	…
git-apply.txt	…
git-archimport.txt	…
git-archive.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-bisect-lk2009.txt	…
git-bisect.txt	…
git-blame.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-branch.txt	Merge branch 'nd/columns'	2012-05-03 15:13:31 -07:00
git-bundle.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-cat-file.txt	…
git-check-attr.txt	…
git-check-ref-format.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-checkout-index.txt	…
git-checkout.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-cherry-pick.txt	Merge branch 'cn/cherry-pick-range-docs'	2012-06-25 11:25:38 -07:00
git-cherry.txt	…
git-citool.txt	…
git-clean.txt	…
git-clone.txt	clone: allow --no-local to turn off local optimizations	2012-05-30 09:51:22 -07:00
git-column.txt	Documentation: spelling fixes	2012-06-19 11:35:19 -07:00
git-commit-tree.txt	git-commit-tree(1): update synopsis	2012-06-19 11:36:57 -07:00
git-commit.txt	Merge branch 'rr/doc-commit'	2012-06-25 11:24:42 -07:00
git-config.txt	config doc: remove confusion about relative GIT_DIR from FILES section	2012-05-25 11:22:02 -07:00
git-count-objects.txt	…
git-credential-cache--daemon.txt	…
git-credential-cache.txt	…
git-credential-store.txt	…
git-cvsexportcommit.txt	…
git-cvsimport.txt	…
git-cvsserver.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-daemon.txt	…
git-describe.txt	…
git-diff-files.txt	…
git-diff-index.txt	…
git-diff-tree.txt	…
git-diff.txt	…
git-difftool.txt	difftool: print list of valid tools with '--tool-help'	2012-04-23 12:00:42 -07:00
git-fast-export.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-fast-import.txt	Merge branch 'jk/doc-asciidoc-inline-literal'	2012-05-02 13:51:45 -07:00
git-fetch-pack.txt	fetch-pack: new --stdin option to read refs from stdin	2012-04-02 13:47:15 -07:00
git-fetch.txt	…
git-filter-branch.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-fmt-merge-msg.txt	Document merge.branchdesc configuration variable	2012-02-23 11:20:15 -08:00
git-for-each-ref.txt	…
git-format-patch.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-fsck-objects.txt	…
git-fsck.txt	fsck doc: a minor typofix	2012-03-05 11:32:19 -08:00
git-gc.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-get-tar-commit-id.txt	…
git-grep.txt	Merge branch 'rs/maint-grep-F' into maint	2012-06-01 13:01:41 -07:00
git-gui.txt	…
git-hash-object.txt	…
git-help.txt	…
git-http-backend.txt	…
git-http-fetch.txt	…
git-http-push.txt	…
git-imap-send.txt	…
git-index-pack.txt	index-pack: support multithreaded delta resolving	2012-05-07 15:48:15 -07:00
git-init-db.txt	…
git-init.txt	…
git-instaweb.txt	…
git-log.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-lost-found.txt	…
git-ls-files.txt	…
git-ls-remote.txt	…
git-ls-tree.txt	…
git-mailinfo.txt	Merge branch 'tr/maint-mailinfo'	2012-01-12 23:34:26 -08:00
git-mailsplit.txt	…
git-merge-base.txt	…
git-merge-file.txt	…
git-merge-index.txt	…
git-merge-one-file.txt	…
git-merge-tree.txt	…
git-merge.txt	merge: use editor by default in interactive sessions	2012-01-23 14:34:55 -08:00
git-mergetool--lib.txt	…
git-mergetool.txt	…
git-mktag.txt	…
git-mktree.txt	…
git-mv.txt	…
git-name-rev.txt	…
git-notes.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-p4.txt	Sync with maint	2012-05-07 13:28:34 -07:00
git-pack-objects.txt	…
git-pack-redundant.txt	…
git-pack-refs.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-parse-remote.txt	…
git-patch-id.txt	…
git-peek-remote.txt	…
git-prune-packed.txt	…
git-prune.txt	…
git-pull.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-push.txt	Merge branch 'jk/doc-asciidoc-inline-literal'	2012-05-02 13:51:45 -07:00
git-quiltimport.txt	…
git-read-tree.txt	Merge branch 'jh/fetch-head-update'	2012-01-06 12:44:01 -08:00
git-rebase.txt	rebase -i: support --root without --onto	2012-06-26 15:08:10 -07:00
git-receive-pack.txt	…
git-reflog.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-relink.txt	…
git-remote-ext.txt	…
git-remote-fd.txt	…
git-remote-helpers.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-remote-testgit.txt	…
git-remote.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-repack.txt	fsck: --no-dangling omits "dangling object" information	2012-02-28 14:55:39 -08:00
git-replace.txt	…
git-repo-config.txt	…
git-request-pull.txt	…
git-rerere.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-reset.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-rev-list.txt	…
git-rev-parse.txt	Merge branch 'js/rev-parse-doc-fix'	2012-05-23 13:35:19 -07:00
git-revert.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-rm.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-send-email.txt	send-email: document the --smtp-debug option	2012-02-27 10:29:24 -08:00
git-send-pack.txt	…
git-sh-i18n--envsubst.txt	correct a few doubled-word nits in comments and documentation	2012-03-28 11:18:35 -07:00
git-sh-i18n.txt	…
git-sh-setup.txt	Merge branch 'tr/doc-sh-setup' into maint	2011-12-28 11:42:51 -08:00
git-shell.txt	…
git-shortlog.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-show-branch.txt	…
git-show-index.txt	…
git-show-ref.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-show.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-stage.txt	…
git-stash.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-status.txt	Merge branch 'jk/maint-status-porcelain-z-b' into maint	2012-05-24 17:32:30 -07:00
git-stripspace.txt	…
git-submodule.txt	Documentation: Fix misspellings	2012-06-22 14:25:04 -07:00
git-svn.txt	git-svn: clarify the referent of dcommit's optional argument	2012-05-17 09:35:18 +00:00
git-symbolic-ref.txt	symbolic-ref --short: abbreviate the output unambiguously	2012-02-27 15:58:36 -08:00
git-tag.txt	tag: add --column	2012-04-27 09:26:39 -07:00
git-tar-tree.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-tools.txt	…
git-unpack-file.txt	…
git-unpack-objects.txt	…
git-update-index.txt	update-index: upgrade/downgrade on-disk index version	2012-04-04 09:57:50 -07:00
git-update-ref.txt	…
git-update-server-info.txt	…
git-upload-archive.txt	…
git-upload-pack.txt	…
git-var.txt	ident: report passwd errors with a more friendly message	2012-05-22 09:08:20 -07:00
git-verify-pack.txt	…
git-verify-tag.txt	…
git-web--browse.txt	…
git-whatchanged.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-write-tree.txt	…
git.txt	Git 1.7.11.1	2012-06-21 14:43:59 -07:00
gitattributes.txt	Add a setting to require a filter to be successful	2012-02-17 07:37:08 -08:00
gitcli.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
gitcore-tutorial.txt	Merge branch 'zj/diff-stat-smaller-num-columns'	2012-05-02 13:53:28 -07:00
gitcredentials.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
gitcvs-migration.txt	…
gitdiffcore.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
gitglossary.txt	…
githooks.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
gitignore.txt	…
gitk.txt	…
gitmodules.txt	document submdule.$name.update=none option for gitmodules	2012-05-11 08:39:33 -07:00
gitnamespaces.txt	…
gitrepository-layout.txt	…
gitrevisions.txt	…
gittutorial-2.txt	Use correct grammar in diffstat summary line	2012-02-03 23:19:42 -08:00
gittutorial.txt	…
gitweb.conf.txt	Documentation: spelling fixes	2012-06-19 11:35:19 -07:00
gitweb.txt	Documentation/gitweb: trivial English fixes	2012-03-23 11:22:04 -07:00
gitworkflows.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
glossary-content.txt	…
howto-index.sh	…
i18n.txt	…
install-doc-quick.sh	…
install-webdoc.sh	…
mailmap.txt	…
manpage-1.72.xsl	…
manpage-base-url.xsl.in	…
manpage-base.xsl	…
manpage-bold-literal.xsl	…
manpage-normal.xsl	…
manpage-quote-apos.xsl	…
manpage-suppress-sp.xsl	…
merge-config.txt	…
merge-options.txt	merge: backport GIT_MERGE_AUTOEDIT support	2012-03-20 15:39:10 -07:00
merge-strategies.txt	…
pretty-formats.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
pretty-options.txt	…
pull-fetch-param.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
rev-list-options.txt	Merge branch 'cn/cherry-pick-range-docs'	2012-06-25 11:25:38 -07:00
revisions.txt	Documentation: do not assume that n > 1 in <rev>~$n	2012-03-02 09:33:29 -08:00
sequencer.txt	…
urls-remotes.txt	…
urls.txt	…
user-manual.conf	…
user-manual.txt	Documentation: spelling fixes	2012-06-19 11:35:19 -07:00