Junio C Hamano 329351feeb Merge branch 'kb/merge-recursive-rename-threshold' ... * kb/merge-recursive-rename-threshold: diff: add synonyms for -M, -C, -B merge-recursive: option to specify rename threshold Conflicts: Documentation/diff-options.txt Documentation/merge-strategies.txt		2010-10-26 21:54:04 -07:00
..
howto	Merge branch 'jn/cherry-revert-message-clean-up'	2010-08-31 16:25:11 -07:00
pt_BR
RelNotes	Sync with 1.7.3.2	2010-10-21 17:16:10 -07:00
technical	Merge branch 'jf/merge-ignore-ws'	2010-10-26 21:40:54 -07:00
.gitattributes
.gitignore
asciidoc.conf	Merge branch 'jc/maint-doc-em-dash'	2010-09-03 09:43:42 -07:00
blame-options.txt
build-docdep.perl
cat-texi.perl
cmd-list.perl
CodingGuidelines	CodingGuidelines: reword parameter expansion section	2010-10-13 11:15:14 -07:00
config.txt	Merge branch 'po/sendemail'	2010-10-26 21:37:54 -07:00
date-formats.txt
diff-format.txt
diff-generate-patch.txt	Clarify and extend the "git diff" format documentation	2010-10-19 14:15:30 -07:00
diff-options.txt	Merge branch 'kb/merge-recursive-rename-threshold'	2010-10-26 21:54:04 -07:00
docbook-xsl.css
docbook.xsl	Documentation: set a !DOCTYPE for user manual	2010-08-20 10:53:56 -07:00
everyday.txt
fetch-options.txt	fetch: allow command line --tags to override config	2010-08-14 19:24:23 -07:00
fix-texi.perl
git-add.txt	Merge branch 'jc/maint-doc-em-dash'	2010-09-03 09:43:42 -07:00
git-am.txt	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
git-annotate.txt
git-apply.txt	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
git-archimport.txt	Martin Langhoff has a new e-mail address	2010-10-06 12:08:48 -07:00
git-archive.txt	Use angles for placeholders consistently	2010-10-08 12:29:52 -07:00
git-bisect-lk2009.txt	Documentation: remove stray backslashes from "Fighting regressions" article	2010-08-20 14:16:51 -07:00
git-bisect.txt
git-blame.txt
git-branch.txt
git-bundle.txt	Use angles for placeholders consistently	2010-10-08 12:29:52 -07:00
git-cat-file.txt	Documentation: gitrevisions is in section 7	2010-10-13 19:10:55 -07:00
git-check-attr.txt
git-check-ref-format.txt	Documentation: gitrevisions is in section 7	2010-10-13 19:10:55 -07:00
git-checkout-index.txt	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
git-checkout.txt	Fix missing 'does' in man-page for 'git checkout'	2010-09-27 15:08:06 -07:00
git-cherry-pick.txt	Documentation: gitrevisions is in section 7	2010-10-13 19:10:55 -07:00
git-cherry.txt
git-citool.txt
git-clean.txt
git-clone.txt	Documentation/git-clone: describe --mirror more verbosely	2010-10-06 11:24:17 -07:00
git-commit-tree.txt	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
git-commit.txt
git-config.txt
git-count-objects.txt
git-cvsexportcommit.txt	Martin Langhoff has a new e-mail address	2010-10-06 12:08:48 -07:00
git-cvsimport.txt
git-cvsserver.txt	Martin Langhoff has a new e-mail address	2010-10-06 12:08:48 -07:00
git-daemon.txt	Merge branch 'as/daemon-multi-listen'	2010-10-26 21:50:03 -07:00
git-describe.txt
git-diff-files.txt
git-diff-index.txt
git-diff-tree.txt
git-diff.txt	Documentation: update implicit "--no-index" behavior in "git diff"	2010-10-13 19:10:56 -07:00
git-difftool.txt
git-fast-export.txt	Use angles for placeholders consistently	2010-10-08 12:29:52 -07:00
git-fast-import.txt	Merge branch 'maint'	2010-10-13 20:20:09 -07:00
git-fetch-pack.txt
git-fetch.txt	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
git-filter-branch.txt	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
git-fmt-merge-msg.txt	merge: Make 'merge.log' an integer or boolean option	2010-09-09 11:39:23 -07:00
git-for-each-ref.txt	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
git-format-patch.txt	Merge branch 'maint'	2010-10-13 20:20:09 -07:00
git-fsck-objects.txt
git-fsck.txt
git-gc.txt
git-get-tar-commit-id.txt
git-grep.txt	Documentation: add missing quotes to "git grep" examples	2010-08-20 14:16:21 -07:00
git-gui.txt
git-hash-object.txt
git-help.txt	Work around em-dash handling in newer AsciiDoc	2010-08-24 09:48:20 -07:00
git-http-backend.txt
git-http-fetch.txt
git-http-push.txt
git-imap-send.txt
git-index-pack.txt	Use angles for placeholders consistently	2010-10-08 12:29:52 -07:00
git-init-db.txt
git-init.txt	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
git-instaweb.txt	Merge branch 'jc/maint-doc-em-dash'	2010-09-03 09:43:42 -07:00
git-log.txt	Documentation: gitrevisions is in section 7	2010-10-13 19:10:55 -07:00
git-lost-found.txt
git-ls-files.txt	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
git-ls-remote.txt
git-ls-tree.txt	Use angles for placeholders consistently	2010-10-08 12:29:52 -07:00
git-mailinfo.txt
git-mailsplit.txt	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
git-merge-base.txt	merge-base --independent to print reduced parent list in a merge	2010-08-18 14:02:03 -07:00
git-merge-file.txt
git-merge-index.txt	Documentation: remove backslashes in manpage synopses	2010-08-20 14:16:22 -07:00
git-merge-one-file.txt
git-merge-tree.txt
git-merge.txt
git-mergetool--lib.txt	Work around em-dash handling in newer AsciiDoc	2010-08-24 09:48:20 -07:00
git-mergetool.txt	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
git-mktag.txt
git-mktree.txt
git-mv.txt
git-name-rev.txt
git-notes.txt	notes: allow --dry-run for -n and --verbose for -v	2010-08-09 10:12:50 -07:00
git-pack-objects.txt	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
git-pack-redundant.txt
git-pack-refs.txt
git-parse-remote.txt
git-patch-id.txt
git-peek-remote.txt
git-prune-packed.txt
git-prune.txt	prune: allow --dry-run for -n and --verbose for -v	2010-08-09 10:13:18 -07:00
git-pull.txt	Documentation: flesh out “git pull” description	2010-08-02 15:48:18 -07:00
git-push.txt	Documentation: gitrevisions is in section 7	2010-10-13 19:10:55 -07:00
git-quiltimport.txt
git-read-tree.txt	read-tree: deprecate syntax without tree-ish args	2010-09-10 08:37:14 -07:00
git-rebase.txt	Merge branch 'jn/doc-backslash'	2010-09-03 09:43:42 -07:00
git-receive-pack.txt
git-reflog.txt	Documentation: gitrevisions is in section 7	2010-10-13 19:10:55 -07:00
git-relink.txt	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
git-remote-helpers.txt
git-remote.txt	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
git-repack.txt	Sync with 1.7.3.2	2010-10-21 17:16:10 -07:00
git-replace.txt
git-repo-config.txt
git-request-pull.txt
git-rerere.txt
git-reset.txt	git-reset.txt: make modes description more consistent	2010-09-18 15:14:41 -07:00
git-rev-list.txt	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
git-rev-parse.txt	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
git-revert.txt	Documentation: gitrevisions is in section 7	2010-10-13 19:10:55 -07:00
git-rm.txt	Documentation: clarify quoting in "git rm" example	2010-08-20 14:16:21 -07:00
git-send-email.txt	Merge branch 'jp/send-email-to-cmd'	2010-10-26 21:52:26 -07:00
git-send-pack.txt
git-sh-setup.txt
git-shell.txt	shell: Rewrite documentation and improve error message	2010-08-24 10:47:21 -07:00
git-shortlog.txt	Remove stray quotes in --pretty and --format documentation	2010-10-08 12:31:07 -07:00
git-show-branch.txt	Merge branch 'sn/doc-opt-notation' into maint	2010-10-21 16:26:42 -07:00
git-show-index.txt
git-show-ref.txt	git-show-ref.txt: clarify the pattern matching	2010-10-19 14:15:30 -07:00
git-show.txt	Documentation: gitrevisions is in section 7	2010-10-13 19:10:55 -07:00
git-stage.txt
git-stash.txt	detached-stash: update Documentation	2010-08-21 23:51:22 -07:00
git-status.txt	Submodules: Use "ignore" settings from .gitmodules too for diff and status	2010-08-09 09:11:44 -07:00
git-stripspace.txt
git-submodule.txt
git-svn.txt	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
git-symbolic-ref.txt
git-tag.txt
git-tar-tree.txt
git-tools.txt
git-unpack-file.txt
git-unpack-objects.txt
git-update-index.txt	Merge branch 'sn/doc-opt-notation' into maint	2010-10-21 16:26:42 -07:00
git-update-ref.txt
git-update-server-info.txt
git-upload-archive.txt
git-upload-pack.txt
git-var.txt
git-verify-pack.txt
git-verify-tag.txt
git-web--browse.txt	Use angles for placeholders consistently	2010-10-08 12:29:52 -07:00
git-whatchanged.txt
git-write-tree.txt
git.txt	Git 1.7.3.2	2010-10-21 17:14:32 -07:00
gitattributes.txt	Merge branch 'bc/fortran-userdiff'	2010-09-29 13:49:23 -07:00
gitcli.txt
gitcore-tutorial.txt	Documentation: gitrevisions is in section 7	2010-10-13 19:10:55 -07:00
gitcvs-migration.txt
gitdiffcore.txt	gitdiffcore doc: update pickaxe description	2010-08-31 14:28:20 -07:00
gitglossary.txt
githooks.txt
gitignore.txt	Documentation: clarify quoting in gitignore docs	2010-08-20 14:16:21 -07:00
gitk.txt	Documentation: gitrevisions is in section 7	2010-10-13 19:10:55 -07:00
gitmodules.txt	Typos in code comments, an error message, documentation	2010-08-22 13:26:13 -07:00
gitrepository-layout.txt
gitrevisions.txt
gittutorial-2.txt
gittutorial.txt
gitworkflows.txt
glossary-content.txt
howto-index.sh
i18n.txt
install-doc-quick.sh
install-webdoc.sh	install-webdoc: keep installed RelNotes-*.txt	2010-09-09 16:17:59 -07:00
mailmap.txt
Makefile	docs: fix Makefile dependency for user manual	2010-08-21 21:53:16 -07:00
manpage-1.72.xsl
manpage-base-url.xsl.in
manpage-base.xsl
manpage-bold-literal.xsl
manpage-normal.xsl
manpage-quote-apos.xsl
manpage-suppress-sp.xsl
merge-config.txt	Merge branch 'rr/fmt-merge-msg'	2010-09-29 13:48:20 -07:00
merge-options.txt	merge: Make '--log' an integer option for number of shortlog entries	2010-09-09 11:39:20 -07:00
merge-strategies.txt	Merge branch 'kb/merge-recursive-rename-threshold'	2010-10-26 21:54:04 -07:00
pretty-formats.txt
pretty-options.txt	Remove stray quotes in --pretty and --format documentation	2010-10-08 12:31:07 -07:00
pull-fetch-param.txt
rev-list-options.txt	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
revisions.txt	update comment and documentation for :/foo syntax	2010-09-27 10:54:52 -07:00
SubmittingPatches	SubmittingPatches: Document some extra tags used in commit messages	2010-10-06 13:45:42 -07:00
urls-remotes.txt
urls.txt
user-manual.conf
user-manual.txt	Merge branch 'sn/doc-opt-notation' into maint	2010-10-21 16:26:42 -07:00