H0llyW00dzZ/git
H0llyW00dzZ/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-03-27 07:39:16 +00:00
Code Releases Activity
980d8ce551
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
asciidoc.conf
Fix usage of carets in git-rev-parse(1)
2005-10-05 16:56:31 -07:00
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
Brief documentation for the mysterious git-am script
2005-10-20 22:32:07 -07:00
git-applypatch.txt
[PATCH] Random documentation fixes
2005-10-03 13:23:47 -07:00
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
[PATCH] Documentation: Update all files to use the new gitlink: macro
2005-09-20 15:07:52 -07:00
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
Convert usage of GIT and Git into git
2005-10-10 16:01:31 -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-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
Remove the version tags from the manpages
2005-10-10 14:49:52 -07:00
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
[PATCH] Documentation: Update all files to use the new gitlink: macro
2005-09-20 15:07:52 -07:00
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
Add git-index-pack utility
2005-10-12 18:32:02 -07:00
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
Convert usage of GIT and Git into git
2005-10-10 16:01:31 -07:00
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
Remove the version tags from the manpages
2005-10-10 14:49:52 -07:00
git-merge-index.txt
Use uniform description for the '--' option.
2005-12-08 15:50:13 -08:00
git-merge-one-file.txt
Remove the version tags from the manpages
2005-10-10 14:49:52 -07:00
git-merge.txt
Examples of resetting.
2005-12-16 18:23:33 -08:00
git-mktag.txt
Remove the version tags from the manpages
2005-10-10 14:49:52 -07:00
git-mv.txt
Documentation: git-mv manpage workaround.
2005-12-05 00:15:44 -08:00
git-name-rev.txt
Add git-name-rev
2005-10-26 16:31:58 -07:00
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
[PATCH] Documentation: Update all files to use the new gitlink: macro
2005-09-20 15:07:52 -07:00
git-patch-id.txt
Document git-patch-id a bit better.
2005-10-28 02:39:56 -07:00
git-peek-remote.txt
Convert usage of GIT and Git into git
2005-10-10 16:01:31 -07:00
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
[PATCH] Documentation: Update all files to use the new gitlink: macro
2005-09-20 15:07:52 -07:00
git-receive-pack.txt
Documentation: push/receive hook references.
2005-12-05 00:58:23 -08:00
git-relink.txt
[PATCH] Documentation: Update all files to use the new gitlink: macro
2005-09-20 15:07:52 -07:00
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
[PATCH] Documentation: Update all files to use the new gitlink: macro
2005-09-20 15:07:52 -07:00
git-reset.txt
Documentation: git-reset - interrupted workflow.
2006-01-13 13:17:55 -08:00
git-resolve.txt
The synopsis of the manpages should use the hyphenated version
2005-10-10 16:01:32 -07:00
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
Remove the version tags from the manpages
2005-10-10 14:49:52 -07:00
git-send-pack.txt
Remove the version tags from the manpages
2005-10-10 14:49:52 -07:00
git-sh-setup.txt
[PATCH] Random documentation fixes
2005-10-03 13:23:47 -07:00
git-shell.txt
Documentation for git-shell
2005-10-25 22:51:13 -07:00
git-shortlog.txt
The synopsis of the manpages should use the hyphenated version
2005-10-10 16:01:32 -07:00
git-show-branch.txt
Documentation: spell.
2005-12-29 01:32:56 -08:00
git-show-index.txt
Convert usage of GIT and Git into git
2005-10-10 16:01:31 -07:00
git-ssh-fetch.txt
Remove the version tags from the manpages
2005-10-10 14:49:52 -07:00
git-ssh-upload.txt
Remove the version tags from the manpages
2005-10-10 14:49:52 -07:00
git-status.txt
The synopsis of the manpages should use the hyphenated version
2005-10-10 16:01:32 -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-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
Remove the version tags from the manpages
2005-10-10 14:49:52 -07:00
git-unpack-file.txt
Remove the version tags from the manpages
2005-10-10 14:49:52 -07:00
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
Add missing documentation.
2005-10-04 17:04:03 -07:00
git-update-server-info.txt
Documentation: HTTP needs update-server-info.
2005-12-17 11:39:39 -08:00
git-upload-pack.txt
Remove the version tags from the manpages
2005-10-10 14:49:52 -07:00
git-var.txt
Remove the version tags from the manpages
2005-10-10 14:49:52 -07:00
git-verify-pack.txt
Documentation/git-verify-pack.txt: added documentation for --.
2005-12-08 15:50:14 -08: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
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
Allow asciidoc formatted documentation in howto/
2005-08-29 22:38:12 -07:00
install-webdoc.sh
Install asciidoc sources as well.
2005-11-06 01:12:32 -08:00
Makefile
Everyday GIT with 20 commands
2005-12-09 23:07:29 -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
SubmittingPatches
Add Pine 4.63 help from Daniel.
2005-08-31 11:48:41 -07:00
tutorial.txt
Tutorial: mention shared repository management.
2005-12-24 00:21:11 -08:00