kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
git/Documentation
History
Junio C Hamano 1be0659efc checkout: merge local modifications while switching branches. 
* Instead of going interactive, introduce a command line switch
   '-m' to allow merging changes when normal two-way merge by
   read-tree prevents branch switching.

 * Leave the unmerged stages intact if automerge fails, but
   reset index entries of cleanly merged paths to that of the
   new branch, so that "git diff" (not "git diff HEAD") would
   show the local modifications.

 * Swap the order of trees in read-tree three-way merge used in
   the fallback, so that `git diff` to show the conflicts become
   more natural.

 * Describe the new option and give more examples in the documentation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
 		2006-01-13 16:52:37 -08:00
..
howto Documentation: spell. 2005-12-29 01:32:56 -08:00
technical Documentation: fix missing links to git(7) 2005-12-12 23:55:09 -08:00
.gitignore Fix documentation dependency generation. 2005-11-07 18:21:51 -08:00
Makefile Everyday GIT with 20 commands 2005-12-09 23:07:29 -08:00
SubmittingPatches
…
asciidoc.conf
…
build-docdep.perl Clean build annoyance. 2005-11-08 08:58:52 -08:00
cvs-migration.txt Documentation: spell. 2005-12-29 01:32:56 -08:00
diff-format.txt Documentation: spell. 2005-12-29 01:32:56 -08:00
diff-options.txt Documentation: spell. 2005-12-29 01:32:56 -08:00
diffcore.txt Fix recent documentation format breakage. 2005-10-29 00:50:42 -07:00
everyday.txt Documentation: typos and small fixes in "everyday". 2005-12-18 12:11:27 -08:00
fetch-options.txt Add --keep option to keep downloaded packs to git-fetch. 2006-01-10 22:10:37 -08:00
git-add.txt Documentation: spell. 2005-12-29 01:32:56 -08:00
git-am.txt Wrap synopsis lines and use [verse] to keep formatting 2006-01-05 18:44:28 -08:00
git-apply.txt Wrap synopsis lines and use [verse] to keep formatting 2006-01-05 18:44:28 -08:00
git-applymbox.txt
…
git-applypatch.txt
…
git-archimport.txt Wrap synopsis lines and use [verse] to keep formatting 2006-01-05 18:44:28 -08:00
git-bisect.txt Documentation: talk about pathspec in bisect. 2005-12-05 00:15:24 -08:00
git-branch.txt Documentation: more examples. 2005-12-12 23:24:06 -08:00
git-cat-file.txt Wrap synopsis lines and use [verse] to keep formatting 2006-01-05 18:44:28 -08:00
git-check-ref-format.txt Forbid pattern maching characters in refnames. 2005-12-16 18:23:52 -08:00
git-checkout-index.txt Wrap synopsis lines and use [verse] to keep formatting 2006-01-05 18:44:28 -08:00
git-checkout.txt checkout: merge local modifications while switching branches. 2006-01-13 16:52:37 -08:00
git-cherry-pick.txt Add documentation for git-revert and git-cherry-pick. 2005-12-08 15:50:14 -08:00
git-cherry.txt
…
git-clone-pack.txt clone-pack: make it usable for partial branch cloning. 2005-12-14 21:25:22 -08:00
git-clone.txt Merge fixes up to GIT 1.0.7 2006-01-05 20:54:42 -08:00
git-commit-tree.txt trivial: clarify, what are the config's user.name and user.email about 2006-01-05 17:23:21 -08:00
git-commit.txt Documentation: git-commit -a 2006-01-13 12:59:21 -08:00
git-convert-objects.txt
…
git-count-objects.txt
…
git-cvsexportcommit.txt Wrap synopsis lines and use [verse] to keep formatting 2006-01-05 18:44:28 -08:00
git-cvsimport.txt Wrap synopsis lines and use [verse] to keep formatting 2006-01-05 18:44:28 -08:00
git-daemon.txt git-daemon --base-path 2006-01-07 21:43:02 -08:00
git-describe.txt git-describe: documentation. 2005-12-27 17:57:28 -08:00
git-diff-files.txt diff-files: show diffs with stage0 and unmerged stage at the same time. 2005-11-30 02:17:51 -08:00
git-diff-index.txt Documentation: spell. 2005-12-29 01:32:56 -08:00
git-diff-stages.txt
…
git-diff-tree.txt Wrap synopsis lines and use [verse] to keep formatting 2006-01-05 18:44:28 -08:00
git-diff.txt Documentation: spell. 2005-12-29 01:32:56 -08:00
git-fetch-pack.txt fetch-pack: -k option to keep downloaded pack. 2005-12-17 23:11:29 -08:00
git-fetch.txt Documentation: recursive is the default strategy these days. 2005-12-08 14:04:33 -08:00
git-fmt-merge-msg.txt Documentation for git-fmt-merge-msg 2005-11-01 14:45:49 -08:00
git-format-patch.txt Wrap synopsis lines and use [verse] to keep formatting 2006-01-05 18:44:28 -08:00
git-fsck-objects.txt Wrap synopsis lines and use [verse] to keep formatting 2006-01-05 18:44:28 -08:00
git-get-tar-commit-id.txt
…
git-grep.txt Wrap synopsis lines and use [verse] to keep formatting 2006-01-05 18:44:28 -08:00
git-hash-object.txt Allow saving an object from a pipe 2005-12-10 18:57:57 -08:00
git-http-fetch.txt Wrap synopsis lines and use [verse] to keep formatting 2006-01-05 18:44:28 -08:00
git-http-push.txt Add support for pushing to a remote repository using HTTP/DAV 2005-11-06 01:14:44 -08:00
git-index-pack.txt
…
git-init-db.txt git-init-db(1): Describe --shared and the idempotent nature of init-db 2006-01-05 17:22:31 -08:00
git-local-fetch.txt
…
git-log.txt Documentation/git-log.txt: trivial typo fix. 2005-11-16 13:19:37 -08:00
git-lost-found.txt Rename lost+found to lost-found. 2005-11-13 02:07:02 -08:00
git-ls-files.txt Documentation: spell. 2005-12-29 01:32:56 -08:00
git-ls-remote.txt Documentation/git-ls-remote.txt: Add -h and -t. 2005-12-08 15:50:15 -08:00
git-ls-tree.txt Update the git-ls-tree documentation 2005-12-04 16:02:16 -08:00
git-mailinfo.txt mailinfo: Do not use -u=<encoding>; say --encoding=<encoding> 2005-11-28 01:29:52 -08:00
git-mailsplit.txt git-am support for naked email messages (take 2) 2005-12-14 02:04:56 -08:00
git-merge-base.txt
…
git-merge-index.txt Use uniform description for the '--' option. 2005-12-08 15:50:13 -08:00
git-merge-one-file.txt
…
git-merge.txt Examples of resetting. 2005-12-16 18:23:33 -08:00
git-mktag.txt
…
git-mv.txt Documentation: git-mv manpage workaround. 2005-12-05 00:15:44 -08:00
git-name-rev.txt
…
git-pack-objects.txt Documentation: spell. 2005-12-29 01:32:56 -08:00
git-pack-redundant.txt Document the "ignore objects" feature of git-pack-redundant 2005-11-18 15:34:19 -08:00
git-parse-remote.txt
…
git-patch-id.txt
…
git-peek-remote.txt
…
git-prune-packed.txt Added documentation for few missing options. 2005-12-05 21:47:16 -08:00
git-prune.txt git-prune: never lose objects reachable from our refs. 2005-12-08 23:18:41 -08:00
git-pull.txt Examples of resetting. 2005-12-16 18:23:33 -08:00
git-push.txt Documentation: push/receive hook references. 2005-12-05 00:58:23 -08:00
git-read-tree.txt Documentation/git-read-tree.txt: Add --reset to SYNOPSIS. 2005-12-08 15:50:16 -08:00
git-rebase.txt
…
git-receive-pack.txt Documentation: push/receive hook references. 2005-12-05 00:58:23 -08:00
git-relink.txt
…
git-repack.txt Documentation/git-repack.txt: Add -l and -n. 2005-12-08 15:50:15 -08:00
git-repo-config.txt Documentation: spell. 2005-12-29 01:32:56 -08:00
git-request-pull.txt
…
git-reset.txt Documentation: git-reset - interrupted workflow. 2006-01-13 13:17:55 -08:00
git-resolve.txt
…
git-rev-list.txt Wrap synopsis lines and use [verse] to keep formatting 2006-01-05 18:44:28 -08:00
git-rev-parse.txt rev-parse: --show-cdup 2005-12-22 22:35:38 -08:00
git-revert.txt Add documentation for git-revert and git-cherry-pick. 2005-12-08 15:50:14 -08:00
git-send-email.txt
…
git-send-pack.txt
…
git-sh-setup.txt
…
git-shell.txt
…
git-shortlog.txt
…
git-show-branch.txt Documentation: spell. 2005-12-29 01:32:56 -08:00
git-show-index.txt
…
git-ssh-fetch.txt
…
git-ssh-upload.txt
…
git-status.txt
…
git-stripspace.txt
…
git-svnimport.txt Documentation/git-svnimport: document -T and -t switches correctly 2006-01-05 20:28:19 -08:00
git-symbolic-ref.txt Documentation: do not blindly run 'cat' .git/HEAD, or echo into it. 2005-11-15 01:31:04 -08:00
git-tag.txt Documentation/git-tag.txt: Fix the order of sections (DESCRIPTION should come before OPTIONS). 2005-12-08 15:50:15 -08:00
git-tar-tree.txt
…
git-unpack-file.txt
…
git-unpack-objects.txt Document the -n command-line option to git-unpack-objects 2005-11-14 17:15:32 -08:00
git-update-index.txt update-index: allow --index-info to add higher stages. 2005-12-07 01:53:50 -08:00
git-update-ref.txt
…
git-update-server-info.txt Documentation: HTTP needs update-server-info. 2005-12-17 11:39:39 -08:00
git-upload-pack.txt
…
git-var.txt
…
git-verify-pack.txt Documentation/git-verify-pack.txt: added documentation for --. 2005-12-08 15:50:14 -08:00
git-verify-tag.txt
…
git-whatchanged.txt Add examples for git-log documentation and others. 2005-10-30 22:54:39 -08:00
git-write-tree.txt Added documentation for few missing options. 2005-12-05 21:47:16 -08:00
git.txt Merge fixes up to GIT 1.0.7 2006-01-05 20:54:42 -08:00
gitk.txt Add examples for git-log documentation and others. 2005-10-30 22:54:39 -08:00
glossary.txt glossary: explain "master" and "origin" 2006-01-10 16:02:54 -08:00
hooks.txt Documentation: stdout of update-hook is connected to /dev/null 2005-12-19 16:38:16 -08:00
howto-index.sh
…
install-webdoc.sh Install asciidoc sources as well. 2005-11-06 01:12:32 -08:00
merge-options.txt Documentation: recursive is the default strategy these days. 2005-12-08 14:04:33 -08:00
merge-strategies.txt Documentation: recursive is the default strategy these days. 2005-12-08 14:04:33 -08:00
pull-fetch-param.txt Documentation: clarify fetch parameter descriptions. 2006-01-12 22:03:11 -08:00
repository-layout.txt Documentation: spell. 2005-12-29 01:32:56 -08:00
sort_glossary.pl Documentation(glossary): minor formatting clean-ups. 2005-12-07 16:16:04 -08:00
tutorial.txt Tutorial: mention shared repository management. 2005-12-24 00:21:11 -08:00