undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
d4f8b390a4
git-commit-vandalism/Documentation
History
Junio C Hamano c859600954 [PATCH] read-tree: save more user hassles during fast-forward. 
This implements the "never lose the current cache information or
the work tree state, but favor a successful merge over merge
failure" principle in the fast-forward two-tree merge operation.

It comes with a set of tests to cover all the cases described in
the case matrix found in the new documentation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-07 11:41:51 -07:00
..
diff-format.txt [PATCH] Documentation: describe git extended diff headers. 2005-06-05 15:23:57 -07:00
diffcore.txt [PATCH] Documentation: describe diff tweaking. 2005-06-05 15:23:57 -07:00
git-apply-patch-script.txt [PATCH 1/4] split core-git.txt and update 2005-05-10 14:55:22 -07:00
git-cat-file.txt [PATCH 1/4] split core-git.txt and update 2005-05-10 14:55:22 -07:00
git-check-files.txt [PATCH 3/4] split core-git.txt and update 2005-05-10 15:01:23 -07:00
git-checkout-cache.txt [PATCH] Implement git-checkout-cache -u to update stat information in the cache. 2005-05-19 09:50:57 -07:00
git-commit-tree.txt [PATCH 3/4] split core-git.txt and update 2005-05-10 15:01:23 -07:00
git-convert-cache.txt [PATCH 1/4] split core-git.txt and update 2005-05-10 14:55:22 -07:00
git-diff-cache.txt [PATCH] diff: Fix docs and add -O to diff-helper. 2005-06-03 11:23:03 -07:00
git-diff-files.txt [PATCH] diff: Fix docs and add -O to diff-helper. 2005-06-03 11:23:03 -07:00
git-diff-helper.txt [PATCH] diff: Fix docs and add -O to diff-helper. 2005-06-03 11:23:03 -07:00
git-diff-tree.txt [PATCH] diff: Fix docs and add -O to diff-helper. 2005-06-03 11:23:03 -07:00
git-export.txt [PATCH 1/4] split core-git.txt and update 2005-05-10 14:55:22 -07:00
git-fsck-cache.txt Fix up git-fsck-cache documentation 2005-05-22 14:32:26 -07:00
git-http-pull.txt [PATCH] pull: gracefully recover from delta retrieval failure. 2005-06-05 14:18:00 -07:00
git-init-db.txt [PATCH 3/4] split core-git.txt and update 2005-05-10 15:01:23 -07:00
git-local-pull.txt [PATCH] pull: gracefully recover from delta retrieval failure. 2005-06-05 14:18:00 -07:00
git-ls-files.txt [PATCH 3/3] Add git-ls-files -k. 2005-05-13 07:34:59 +02:00
git-ls-tree.txt [PATCH] Rewrite ls-tree to behave more like "/bin/ls -a" 2005-05-29 11:40:40 -07:00
git-merge-base.txt [PATCH 1/4] split core-git.txt and update 2005-05-10 14:55:22 -07:00
git-merge-cache.txt Document git-merge-cache -o 2005-05-11 04:49:36 +02:00
git-merge-one-file-script.txt [PATCH 1/4] split core-git.txt and update 2005-05-10 14:55:22 -07:00
git-mkdelta.txt [PATCH] Docs - delta object 2005-05-22 11:07:22 -07:00
git-mktag.txt [PATCH 3/4] split core-git.txt and update 2005-05-10 15:01:23 -07:00
git-prune-script.txt [PATCH 1/4] split core-git.txt and update 2005-05-10 14:55:22 -07:00
git-pull-script.txt [PATCH 1/4] split core-git.txt and update 2005-05-10 14:55:22 -07:00
git-read-tree.txt [PATCH] read-tree: save more user hassles during fast-forward. 2005-06-07 11:41:51 -07:00
git-resolve-script.txt [PATCH 1/4] split core-git.txt and update 2005-05-10 14:55:22 -07:00
git-rev-list.txt [PATCH] Modify git-rev-list to linearise the commit history in merge order. 2005-06-06 09:07:26 -07:00
git-rev-tree.txt [PATCH 1/4] split core-git.txt and update 2005-05-10 14:55:22 -07:00
git-ssh-pull.txt [PATCH] Document git-ssh-pull and git-ssh-push 2005-06-06 19:49:45 -07:00
git-ssh-push.txt [PATCH] Document git-ssh-pull and git-ssh-push 2005-06-06 19:49:45 -07:00
git-tag-script.txt [PATCH 1/4] split core-git.txt and update 2005-05-10 14:55:22 -07:00
git-tar-tree.txt [PATCH] git-tar-tree: small doc update 2005-06-02 18:30:08 -07:00
git-unpack-file.txt [PATCH 1/4] split core-git.txt and update 2005-05-10 14:55:22 -07:00
git-update-cache.txt [PATCH] Make git-update-cache --force-remove regular 2005-06-05 16:57:23 -07:00
git-write-blob.txt [PATCH 1/4] split core-git.txt and update 2005-05-10 14:55:22 -07:00
git-write-tree.txt [PATCH 1/4] split core-git.txt and update 2005-05-10 14:55:22 -07:00
git.txt [PATCH] rename git-rpush and git-rpull to git-ssh-push and git-ssh-pull 2005-06-05 16:12:27 -07:00
Makefile [PATCH] Docs - Makefile update 2005-05-22 11:07:22 -07:00
tutorial.txt Clarify git-diff-cache semantics in the tutorial. 2005-06-02 17:15:32 -07:00