mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-03 14:01:22 +02:00
Code
3fb0028253
git/Documentation
History
Steffen Prohaska 3fb0028253 user-manual: Add section "Why bisecting merge commits can be harder ..." 
This commit adds a discussion of the challenge of bisecting
merge commits to the user manual.  The original author is
Junio C Hamano <gitster@pobox.com>, who posted the text to
the mailing list <http://marc.info/?l=git&m=119403257315527&w=2>.
His email was adapted for the manual.

The discussion is added to "Rewriting history and maintainig
patch series".  The text added requires good understanding of
merging and rebasing.  Therefore it should not be placed too
early in the manual.  Right after the section on "Problems with
rewriting history", the discussion of bisect gives another reason
for linearizing as much of the history as possible.

The text includes suggestions and fixes by
Ralf Wildenhues <Ralf.Wildenhues@gmx.de> and
Benoit Sigoure <tsuna@lrde.epita.fr>.

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
2007-11-18 18:15:47 -05:00
..
howto Fixed update-hook example allow-users format. 2007-09-18 17:38:52 -07:00
technical War on whitespace 2007-06-07 00:04:01 -07:00
.gitignore Ignore all man sections as they are generated files. 2007-04-23 22:19:36 -07:00
asciidoc.conf Documentation: Fix man page breakage with DocBook XSL v1.72 2007-11-14 02:01:54 -08:00
blame-options.txt Fix formatting of git-blame documentation. 2007-08-10 00:47:53 -07:00
build-docdep.perl Documentation/build-docdep.perl: Fix dependencies for included asciidoc files 2007-03-01 13:24:54 -08:00
callouts.xsl Revert "tweak manpage formatting" 2007-08-10 11:32:42 -07:00
cmd-list.perl Reorder the list of commands in the manual. 2007-08-08 13:42:32 -07:00
CodingGuidelines Add Documentation/CodingGuidelines 2007-11-07 17:05:53 -08:00
config.txt Fix typo in config.txt 2007-10-02 15:26:57 -07:00
core-tutorial.txt core-tutorial.txt: Fix argument mistake in an example. 2007-11-14 01:59:12 -08:00
cvs-migration.txt Documentation: mention module option to git-cvsimport 2007-03-04 16:47:32 -08:00
diff-format.txt git-diff.txt: add section "output format" describing the diff formats 2007-11-01 17:07:22 -07:00
diff-options.txt fixed link in documentation of diff-options 2007-10-01 23:27:20 -07:00
diffcore.txt War on whitespace 2007-06-07 00:04:01 -07:00
docbook-xsl.css War on whitespace 2007-06-07 00:04:01 -07:00
docbook.xsl Mark user-manual as UTF-8 2007-07-24 00:47:05 -07:00
everyday.txt Documentation: quote commit messages consistently. 2007-11-02 15:38:24 -07:00
fetch-options.txt War on whitespace 2007-06-07 00:04:01 -07:00
fix-texi.perl Add support for an info version of the user manual 2007-08-10 23:16:18 -07:00
git-add.txt replace reference to git-rm with git-reset in git-commit doc 2007-11-14 01:58:03 -08:00
git-am.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-annotate.txt Update git-annotate/git-blame documentation 2007-04-16 01:14:46 -07:00
git-apply.txt apply: get rid of --index-info in favor of --build-fake-ancestor 2007-09-26 13:42:10 -07:00
git-archimport.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-archive.txt git-archive: document --exec 2007-10-15 21:10:54 -04:00
git-bisect.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-blame.txt git-blame -w: ignore whitespace 2007-06-09 18:34:58 -07:00
git-branch.txt git-branch: remove mention of non-existent '-b' option 2007-11-11 23:40:32 -08:00
git-bundle.txt git-bundle: fix commandline examples in the manpage 2007-09-29 15:40:17 -07:00
git-cat-file.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-check-attr.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-check-ref-format.txt
git-checkout-index.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-checkout.txt Say when --track is useful in the git-checkout docs. 2007-10-02 17:26:40 -07:00
git-cherry-pick.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-cherry.txt Merge branch 'maint' 2007-06-12 00:15:16 -07:00
git-citool.txt Document git-gui, git-citool as mainporcelain manual pages 2007-06-22 22:32:32 -07:00
git-clean.txt Fix minor documentation errors 2007-05-07 15:39:57 -07:00
git-clone.txt git-clone.txt: Improve --depth description. 2007-11-01 15:14:38 -07:00
git-commit-tree.txt Documentation: Correct various misspellings and typos. 2007-08-24 18:54:37 -07:00
git-commit.txt replace reference to git-rm with git-reset in git-commit doc 2007-11-14 01:58:03 -08:00
git-config.txt Documentation/git-config.txt: AsciiDoc tweak to avoid leading dot 2007-09-14 14:51:08 -07:00
git-convert-objects.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-count-objects.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-cvsexportcommit.txt Documentation/git-cvsexportcommit.txt: s/mgs/msg/ in example 2007-10-30 11:39:47 -07:00
git-cvsimport.txt Merge branch 'aw/cvs' 2007-06-12 21:04:52 -07:00
git-cvsserver.txt Documentation: For consistency, use CVS instead of cvs. 2007-08-24 18:54:37 -07:00
git-daemon.txt Documentation: minor AsciiDoc mark-up fixes. 2007-09-01 04:06:13 -07:00
git-describe.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-diff-files.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-diff-index.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-diff-tree.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-diff.txt git-diff.txt: add section "output format" describing the diff formats 2007-11-01 17:07:22 -07:00
git-fast-import.txt Documentation: Correct various misspellings and typos. 2007-08-24 18:54:37 -07:00
git-fetch-pack.txt fetch & clone: do not output progress when not on a tty 2007-02-19 19:20:05 -08:00
git-fetch.txt Add urls.txt to git-clone man page 2007-07-05 21:43:48 -07:00
git-filter-branch.txt Remove escaping of '|' in manpage option sections 2007-11-02 15:38:24 -07:00
git-fmt-merge-msg.txt Documentation: Correct various misspellings and typos. 2007-08-24 18:54:37 -07:00
git-for-each-ref.txt Documentation: Reformatted SYNOPSIS for several commands 2007-05-18 21:47:45 -07:00
git-format-patch.txt git-format-patch.txt: fix explanation of an example. 2007-11-01 15:19:43 -07:00
git-fsck-objects.txt git-fsck-objects is now synonym to git-fsck 2007-01-28 16:33:58 -08:00
git-fsck.txt fsck --lost-found: write blob's contents, not their SHA-1 2007-07-22 15:59:27 -07:00
git-gc.txt Fix minor grammatical typos in the git-gc man page 2007-05-31 16:22:28 -07:00
git-get-tar-commit-id.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-grep.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-gui.txt Documentation: Correct various misspellings and typos. 2007-08-24 18:54:37 -07:00
git-hash-object.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-http-fetch.txt Documentation: Correct various misspellings and typos. 2007-08-24 18:54:37 -07:00
git-http-push.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-imap-send.txt
git-index-pack.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-init-db.txt Add an option to quiet git-init. 2007-06-27 22:22:17 -07:00
git-init.txt Add an option to quiet git-init. 2007-06-27 22:22:17 -07:00
git-instaweb.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-local-fetch.txt Documentation: Correct various misspellings and typos. 2007-08-24 18:54:37 -07:00
git-log.txt Porcelain level "log" family should recurse when diffing. 2007-08-28 00:10:21 -07:00
git-lost-found.txt Documentation/git-lost-found.txt: drop unnecessarily duplicated name. 2007-09-21 12:53:08 -07:00
git-ls-files.txt Document ls-files --with-tree=<tree-ish> 2007-09-17 23:57:35 -07:00
git-ls-remote.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-ls-tree.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-mailinfo.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-mailsplit.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-merge-base.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-merge-file.txt Documentation: sync git.txt command list and manual page title 2007-01-18 15:53:37 -08:00
git-merge-index.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-merge-one-file.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-merge-tree.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-merge.txt git-merge: document but discourage the historical syntax 2007-10-30 16:33:55 -07:00
git-mergetool.txt [PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool 2007-06-10 08:27:29 -04:00
git-mktag.txt mktag: minimally update the description. 2007-06-10 16:00:36 -07:00
git-mktree.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-mv.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-name-rev.txt Documentation: Correct various misspellings and typos. 2007-08-24 18:54:37 -07:00
git-pack-objects.txt Move the paragraph specifying where the .idx and .pack files should be 2007-09-21 12:54:11 -07:00
git-pack-redundant.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-pack-refs.txt Documentation: pack-refs --all vs default behaviour 2007-01-26 00:02:51 -08:00
git-parse-remote.txt Documentation: sync git.txt command list and manual page title 2007-01-18 15:53:37 -08:00
git-patch-id.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-peek-remote.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-prune-packed.txt Conjugate "search" correctly in the git-prune-packed man page. 2007-09-21 12:54:24 -07:00
git-prune.txt Merge branch 'maint' 2007-06-09 11:52:43 -07:00
git-pull.txt Add urls.txt to git-clone man page 2007-07-05 21:43:48 -07:00
git-push.txt git-push: documentation and tests for pushing only branches 2007-09-18 14:00:20 -07:00
git-quiltimport.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-read-tree.txt Document git read-tree --trivial 2007-06-16 13:08:09 -07:00
git-rebase.txt rebase -i: squash should retain the authorship of the _first_ commit 2007-09-29 23:16:08 -07:00
git-receive-pack.txt Documentation: Correct various misspellings and typos. 2007-08-24 18:54:37 -07:00
git-reflog.txt git-reflog: document --verbose 2007-10-15 21:10:54 -04:00
git-relink.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-remote.txt git-remote.txt: fix example url 2007-11-17 20:45:12 -05:00
git-repack.txt Documentation: Correct various misspellings and typos. 2007-08-24 18:54:37 -07:00
git-repo-config.txt [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
git-request-pull.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-rerere.txt Enable "git rerere" by the config variable rerere.enabled 2007-07-06 22:39:15 -07:00
git-reset.txt Documentation: quote commit messages consistently. 2007-11-02 15:38:24 -07:00
git-rev-list.txt Documentation: Correct various misspellings and typos. 2007-08-24 18:54:37 -07:00
git-rev-parse.txt Document what the stage numbers in the :$n:path syntax mean. 2007-08-19 22:56:10 -07:00
git-revert.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-rm.txt More permissive "git-rm --cached" behavior without -f. 2007-07-13 23:52:46 -07:00
git-runstatus.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-send-email.txt Merge branch 'jp/send-email-cc' 2007-09-01 13:15:27 -07:00
git-send-pack.txt git-push: documentation and tests for pushing only branches 2007-09-18 14:00:20 -07:00
git-sh-setup.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-shell.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-shortlog.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-show-branch.txt show-branch -g: default to the current branch. 2007-02-03 23:34:22 -08:00
git-show-index.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-show-ref.txt Documentation: show-ref: document --exclude-existing 2007-04-09 18:54:52 -07:00
git-show.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-ssh-fetch.txt Mark disused commit walkers officially deprecated. 2007-07-02 23:29:54 -07:00
git-ssh-upload.txt Mark disused commit walkers officially deprecated. 2007-07-02 23:29:54 -07:00
git-stash.txt git stash: document apply's --index switch 2007-10-01 01:59:29 -07:00
git-status.txt Add a note about the index being updated by git-status in some cases 2007-08-06 23:47:18 -07:00
git-stripspace.txt Remove escaping of '|' in manpage option sections 2007-11-02 15:38:24 -07:00
git-submodule.txt git-submodule(1): update description and key names 2007-07-06 22:39:23 -07:00
git-svn.txt Documentation/git-svn: updated design philosophy notes 2007-09-18 17:07:45 -07:00
git-svnimport.txt Document -u option in git-svnimport man page 2007-08-22 15:37:56 -07:00
git-symbolic-ref.txt add logref support to git-symbolic-ref 2007-01-28 02:16:46 -08:00
git-tag.txt git-tag(1): Remove duplicate text 2007-08-27 01:38:35 -07:00
git-tar-tree.txt Documentation: update tar.umask default 2007-08-22 15:19:41 -07:00
git-tools.txt Add hg-to-git conversion utility. 2007-02-05 13:52:45 -08:00
git-unpack-file.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-unpack-objects.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-update-index.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-update-ref.txt git-update-ref: add --no-deref option for overwriting/detaching ref 2007-05-10 15:24:44 -07:00
git-update-server-info.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-upload-archive.txt Documentation: sync git.txt command list and manual page title 2007-01-18 15:53:37 -08:00
git-upload-pack.txt Fixup no-progress for fetch & clone 2007-02-24 00:26:18 -08:00
git-var.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-verify-pack.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-verify-tag.txt Make verify-tag a builtin. 2007-07-26 22:51:27 -07:00
git-whatchanged.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-write-tree.txt War on whitespace 2007-06-07 00:04:01 -07:00
git.txt documentation: replace Discussion section by link to user-manual chapter 2007-09-15 22:17:24 -04:00
gitattributes.txt Grammar fixes for gitattributes documentation 2007-11-14 01:56:32 -08:00
gitignore.txt Fix spelling of overridden in documentation 2007-09-25 23:38:42 -07:00
gitk.txt gitk.txt: Fix markup. 2007-10-19 23:13:28 -04:00
gitmodules.txt gitmodules(5): remove leading period from synopsis 2007-06-15 22:46:04 -07:00
glossary.txt glossary: add 'reflog' 2007-07-03 13:56:07 -07:00
hooks.txt Documentation: Correct various misspellings and typos. 2007-08-24 18:54:37 -07:00
howto-index.sh
i18n.txt Documentation/i18n.txt: it is i18n.commitencoding not core.commitencoding 2007-02-18 15:58:20 -08:00
install-doc-quick.sh Fix "make GZ=1 quick-install-doc" 2007-08-06 21:16:21 -07:00
install-webdoc.sh user-manual: install user manual stylesheet with other web documents 2007-03-10 23:05:02 -05:00
Makefile Documentation: Fix man page breakage with DocBook XSL v1.72 2007-11-14 02:01:54 -08:00
merge-options.txt War on whitespace 2007-06-07 00:04:01 -07:00
merge-strategies.txt
pretty-formats.txt Support output ISO 8601 format dates 2007-07-13 22:47:49 -07:00
pretty-options.txt pretty-options.txt: tiny doc fix 2007-07-25 00:06:38 -07:00
pull-fetch-param.txt War on whitespace 2007-06-07 00:04:01 -07:00
RelNotes-1.5.0.1.txt GIT 1.5.0.1 2007-02-18 16:18:43 -08:00
RelNotes-1.5.0.2.txt GIT 1.5.0.2 2007-02-26 00:26:06 -08:00
RelNotes-1.5.0.3.txt GIT 1.5.0.3 2007-03-04 17:20:38 -08:00
RelNotes-1.5.0.4.txt War on whitespace 2007-06-07 00:04:01 -07:00
RelNotes-1.5.0.5.txt War on whitespace 2007-06-07 00:04:01 -07:00
RelNotes-1.5.0.6.txt War on whitespace 2007-06-07 00:04:01 -07:00
RelNotes-1.5.0.7.txt GIT 1.5.0.7 2007-04-03 19:27:41 -07:00
RelNotes-1.5.0.txt git-clone: Sync documentation to usage note. 2007-02-19 18:14:29 -08:00
RelNotes-1.5.1.1.txt git-svn: don't allow globs to match regular files 2007-04-18 12:39:04 -07:00
RelNotes-1.5.1.2.txt GIT 1.5.1.2 2007-04-21 13:57:07 -07:00
RelNotes-1.5.1.3.txt War on whitespace 2007-06-07 00:04:01 -07:00
RelNotes-1.5.1.4.txt GIT v1.5.1.4 2007-05-08 22:11:17 -07:00
RelNotes-1.5.1.5.txt GIT 1.5.1.6 2007-05-20 00:15:53 -07:00
RelNotes-1.5.1.6.txt GIT 1.5.1.6 2007-05-20 00:15:53 -07:00
RelNotes-1.5.1.txt GIT 1.5.1 2007-04-03 22:47:01 -07:00
RelNotes-1.5.2.1.txt GIT 1.5.2.1 2007-06-02 16:02:49 -07:00
RelNotes-1.5.2.2.txt GIT 1.5.2.2 2007-06-16 01:13:35 -07:00
RelNotes-1.5.2.3.txt GIT 1.5.2.3 2007-07-02 00:35:58 -07:00
RelNotes-1.5.2.4.txt GIT 1.5.2.4 2007-07-12 12:01:47 -07:00
RelNotes-1.5.2.5.txt GIT 1.5.2.5 2007-08-15 15:01:20 -07:00
RelNotes-1.5.2.txt GIT 1.5.2 2007-05-20 00:30:39 -07:00
RelNotes-1.5.3.1.txt GIT 1.5.3.1: obsolete git-p4 in RPM spec file. 2007-09-03 01:28:37 -07:00
RelNotes-1.5.3.2.txt GIT 1.5.3.2 2007-09-19 03:11:28 -07:00
RelNotes-1.5.3.3.txt Whip post 1.5.3.3 maintenance series into shape. 2007-10-01 02:07:47 -07:00
RelNotes-1.5.3.4.txt GIT 1.5.3.4 2007-10-03 02:33:48 -07:00
RelNotes-1.5.3.5.txt RelNotes-1.5.3.5: fix another typo 2007-11-07 11:37:15 -08:00
RelNotes-1.5.3.6.txt Update draft release notes for 1.5.3.6 2007-11-16 21:17:01 -08:00
RelNotes-1.5.3.txt Typofix: 1.5.3 release notes 2007-09-02 15:03:26 -07:00
repository-layout.txt War on whitespace 2007-06-07 00:04:01 -07:00
SubmittingPatches SubmittingPatches: improve the 'Patch:' section of the checklist 2007-11-08 23:59:44 -08:00
tutorial-2.txt tutorials: add user-manual links 2007-05-19 00:57:19 -04:00
tutorial.txt Documentation: Correct various misspellings and typos. 2007-08-24 18:54:37 -07:00
urls-remotes.txt Add urls.txt to git-clone man page 2007-07-05 21:43:48 -07:00
urls.txt URL: allow port specification in ssh:// URLs 2007-09-01 03:35:29 -07:00
user-manual.conf Documentation: add git user's manual 2007-01-07 20:33:06 -05:00
user-manual.txt user-manual: Add section "Why bisecting merge commits can be harder ..." 2007-11-18 18:15:47 -05:00