Junio C Hamano 47f0b6d5d4 Fall back to three-way merge when applying a patch. ...

After git-apply fails, attempt to find a base tree that the patch
cleanly applies to, and do a three-way merge using that base tree into
the current index, if .dotest/.3way file exists.  This flag can be
controlled by giving -m flag to git-applymbox command.

When the fall-back merge fails, the working tree can be resolved the
same way as you would normally hand resolve a conflicting merge.
When making commit, use .dotest/final-commit as the log message
template.  Or you could just choose to 'git-checkout-index -f -a'
to revert the failed merge.

Signed-off-by: Junio C Hamano <junkio@cox.net>

2005-10-06 14:25:52 -07:00

..

howto

Retire rev-tree.

2005-09-22 01:54:12 -07:00

technical

[PATCH] Finish documenting trivial merge rules

2005-09-24 22:05:55 -07:00

.gitignore

[PATCH] git bugfixes and cleanups, mainly Debian things

2005-08-26 12:54:27 -07:00

asciidoc.conf

Fix usage of carets in git-rev-parse(1)

2005-10-05 16:56:31 -07:00

cvs-migration.txt

Some typos and light editing of various manpages

2005-10-05 15:08:26 -07:00

diff-format.txt

Some typos and light editing of various manpages

2005-10-05 15:08:26 -07:00

diff-options.txt

Some typos and light editing of various manpages

2005-10-05 15:08:26 -07:00

diffcore.txt

Some typos and light editing of various manpages

2005-10-05 15:08:26 -07:00

git-add.txt

Some typos and light editing of various manpages

2005-10-05 15:08:26 -07:00

git-apply.txt

Merge branch 'fixes'

2005-10-05 16:57:23 -07:00

git-applymbox.txt

Fall back to three-way merge when applying a patch.

2005-10-06 14:25:52 -07:00

git-applypatch.txt

[PATCH] Random documentation fixes

2005-10-03 13:23:47 -07:00

git-archimport.txt

Some typos and light editing of various manpages

2005-10-05 15:08:26 -07:00

git-bisect.txt

Some typos and light editing of various manpages

2005-10-05 15:08:26 -07:00

git-branch.txt

Some typos and light editing of various manpages

2005-10-05 15:08:26 -07:00

git-cat-file.txt

Some typos and light editing of various manpages

2005-10-05 15:08:26 -07:00

git-checkout-index.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-checkout.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-cherry-pick.txt

Some typos and light editing of various manpages

2005-10-05 15:08:26 -07:00

git-cherry.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-clone-pack.txt

Some typos and light editing of various manpages

2005-10-05 15:08:26 -07:00

git-clone.txt

[PATCH] Update git-clone documentation

2005-10-02 16:06:08 -07:00

git-commit-tree.txt

Some typos and light editing of various manpages

2005-10-05 15:08:26 -07:00

git-commit.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-convert-objects.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-count-objects.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-cvsimport.txt

[PATCH] Random documentation fixes

2005-10-03 13:23:47 -07:00

git-daemon.txt

[PATCH] git-daemon --syslog to log through syslog

2005-09-24 11:20:45 -07:00

git-diff-files.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-diff-index.txt

[PATCH] Random documentation fixes

2005-10-03 13:23:47 -07:00

git-diff-stages.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-diff-tree.txt

[PATCH] Random documentation fixes

2005-10-03 13:23:47 -07:00

git-diff.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-fetch-pack.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-fetch.txt

[PATCH] Random documentation fixes

2005-10-03 13:23:47 -07:00

git-format-patch.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-fsck-objects.txt

[PATCH] Random documentation fixes

2005-10-03 13:23:47 -07:00

git-get-tar-commit-id.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-grep.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-hash-object.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-http-fetch.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-init-db.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-local-fetch.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-log.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-ls-files.txt

[PATCH] Random documentation fixes

2005-10-03 13:23:47 -07:00

git-ls-remote.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-ls-tree.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-mailinfo.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-mailsplit.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-merge-base.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-merge-index.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-merge-one-file.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-merge.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-mktag.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-octopus.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-pack-objects.txt

[PATCH] Random documentation fixes

2005-10-03 13:23:47 -07:00

git-parse-remote.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-patch-id.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-peek-remote.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-prune-packed.txt

[PATCH] Random documentation fixes

2005-10-03 13:23:47 -07:00

git-prune.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-pull.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-push.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-read-tree.txt

[PATCH] Random documentation fixes

2005-10-03 13:23:47 -07:00

git-rebase.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-receive-pack.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-relink.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-rename.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-repack.txt

[PATCH] Random documentation fixes

2005-10-03 13:23:47 -07:00

git-request-pull.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-reset.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-resolve.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-rev-list.txt

[PATCH] Random documentation fixes

2005-10-03 13:23:47 -07:00

git-rev-parse.txt

Fix usage of carets in git-rev-parse(1)

2005-10-05 16:56:31 -07:00

git-revert.txt

[PATCH] Random documentation fixes

2005-10-03 13:23:47 -07:00

git-send-email.txt

[PATCH] Random documentation fixes

2005-10-03 13:23:47 -07:00

git-send-pack.txt

[PATCH] Random documentation fixes

2005-10-03 13:23:47 -07:00

git-sh-setup.txt

[PATCH] Random documentation fixes

2005-10-03 13:23:47 -07:00

git-shortlog.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-show-branch.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-show-index.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-ssh-fetch.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-ssh-upload.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-status.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-stripspace.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-symbolic-ref.txt

Add missing documentation.

2005-10-04 17:04:03 -07:00

git-tag.txt

Allow "-u" flag to tag signing

2005-10-06 14:23:29 -07:00

git-tar-tree.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-unpack-file.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-unpack-objects.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-update-index.txt

[PATCH] Random documentation fixes

2005-10-03 13:23:47 -07:00

git-update-ref.txt

Add missing documentation.

2005-10-04 17:04:03 -07:00

git-update-server-info.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-upload-pack.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-var.txt

[PATCH] Random documentation fixes

2005-10-03 13:23:47 -07:00

git-verify-pack.txt

[PATCH] Random documentation fixes

2005-10-03 13:23:47 -07:00

git-verify-tag.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-whatchanged.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git-write-tree.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

git.txt

Retire diff-helper.

2005-09-22 01:54:13 -07:00

gitk.txt

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20 15:07:52 -07:00

glossary.txt

[PATCH] More missing terms in glossary.txt

2005-08-26 11:11:48 -07:00

hooks.txt

[PATCH] Escape asciidoc's built-in em-dash replacement

2005-09-11 10:51:36 -07:00

howto-index.sh

Allow asciidoc formatted documentation in howto/

2005-08-29 22:38:12 -07:00

install-webdoc.sh

Ignore datestamp-only changes when installing webdoc.

2005-09-09 01:17:54 -07:00

Makefile

[PATCH] Random documentation fixes

2005-10-03 13:23:47 -07:00

pack-protocol.txt

[PATCH] Document two pack push-pull protocols.

2005-07-13 20:42:26 -07:00

pull-fetch-param.txt

[PATCH] Random documentation fixes

2005-10-03 13:23:47 -07:00

repository-layout.txt

Retire info/rev-cache

2005-09-15 12:46:31 -07:00

sort_glossary.pl

[PATCH] Add Makefile target glossary.html

2005-08-18 10:25:52 -07:00

SubmittingPatches

Add Pine 4.63 help from Daniel.

2005-08-31 11:48:41 -07:00

tutorial.txt

[PATCH] Retitle 'inspecting what happened' section.

2005-09-22 18:31:14 -07:00