Junio C Hamano 8aed4a5e38 Merge branch 'jn/merge-renormalize' ... * jn/merge-renormalize: merge-recursive --renormalize rerere: never renormalize rerere: migrate to parse-options API t4200 (rerere): modernize style ll-merge: let caller decide whether to renormalize ll-merge: make flag easier to populate Documentation/technical: document ll_merge merge-trees: let caller decide whether to renormalize merge-trees: push choice to renormalize away from low level t6038 (merge.renormalize): check that it can be turned off t6038 (merge.renormalize): try checkout -m and cherry-pick t6038 (merge.renormalize): style nitpicks Don't expand CRLFs when normalizing text during merge Try normalizing files to avoid delete/modify conflicts when merging Avoid conflicts when merging branches with mixed normalization Conflicts: builtin/rerere.c t/t4200-rerere.sh		2010-09-03 09:43:41 -07:00
..
howto	Merge branch 'jn/cherry-revert-message-clean-up'	2010-08-31 16:25:11 -07:00
pt_BR
technical	Merge branch 'jn/merge-renormalize'	2010-09-03 09:43:41 -07:00
.gitattributes
.gitignore
asciidoc.conf
blame-options.txt	blame-options.txt: Add default value for -M/-C options.	2010-05-07 09:34:59 -07:00
build-docdep.perl
cat-texi.perl
cmd-list.perl
CodingGuidelines
config.txt	Merge branch 'dj/fetch-tagopt' into maint	2010-09-01 13:52:10 -07:00
date-formats.txt
diff-format.txt
diff-generate-patch.txt	git log -p -m: document -m and honor --first-parent	2010-02-12 11:32:23 -08:00
diff-options.txt	Merge branch 'jl/submodule-ignore-diff'	2010-08-18 12:36:25 -07:00
docbook-xsl.css
docbook.xsl
everyday.txt	everyday: fsck and gc are not everyday operations	2010-03-16 19:25:20 -07:00
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	git add: Add --ignore-missing to SYNOPSIS	2010-07-19 11:11:46 -07:00
git-am.txt	Merge branch 'sh/am-keep-cr'	2010-03-10 15:32:34 -08:00
git-annotate.txt
git-apply.txt	Documentation: cite git-am from git-apply	2010-08-09 09:15:41 -07:00
git-archimport.txt
git-archive.txt	archive documentation: attributes are taken from the tree by default	2010-02-12 09:38:20 -08:00
git-bisect-lk2009.txt	Documentation: spelling fixes	2010-07-20 16:59:17 -07:00
git-bisect.txt
git-blame.txt
git-branch.txt	Merge branch 'maint'	2010-04-17 12:40:45 -07:00
git-bundle.txt
git-cat-file.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00
git-check-attr.txt
git-check-ref-format.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00
git-checkout-index.txt
git-checkout.txt	Merge branch 'tc/checkout-B'	2010-08-18 11:42:47 -07:00
git-cherry-pick.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00
git-cherry.txt
git-citool.txt
git-clean.txt	Add -e/--exclude to git-clean.	2010-07-20 16:52:53 -07:00
git-clone.txt	Sync with Git 1.7.0.3	2010-03-21 17:03:57 -07:00
git-commit-tree.txt
git-commit.txt	Documentation: spelling fixes	2010-07-20 16:59:17 -07:00
git-config.txt
git-count-objects.txt
git-cvsexportcommit.txt
git-cvsimport.txt	Documentation: spelling fixes	2010-07-20 16:59:17 -07:00
git-cvsserver.txt	Documentation: spelling fixes	2010-07-20 16:59:17 -07:00
git-daemon.txt
git-describe.txt	Documentation: explain the meaning of "-g" in git-describe output	2010-03-24 11:31:45 -07:00
git-diff-files.txt
git-diff-index.txt
git-diff-tree.txt
git-diff.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00
git-difftool.txt
git-fast-export.txt	fast-export: Add a --full-tree option	2010-07-19 11:12:22 -07:00
git-fast-import.txt	Merge branch 'jn/fast-import-subtree'	2010-08-18 12:14:41 -07:00
git-fetch-pack.txt	Documentation: describe --thin more accurately	2010-02-18 17:13:18 -08:00
git-fetch.txt	fetch/push: fix usage strings	2010-04-09 21:23:10 -07:00
git-filter-branch.txt
git-fmt-merge-msg.txt
git-for-each-ref.txt	for-each-ref: Field with abbreviated objectname	2010-05-18 21:49:04 -07:00
git-format-patch.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00
git-fsck-objects.txt
git-fsck.txt
git-gc.txt	Merge branch 'maint'	2010-07-05 11:56:53 -07:00
git-get-tar-commit-id.txt
git-grep.txt	Merge branch 'jn/grep-open'	2010-06-30 11:55:38 -07:00
git-gui.txt
git-hash-object.txt	Documentation: spelling fixes	2010-07-20 16:59:17 -07:00
git-help.txt
git-http-backend.txt	Documentation: Clarify support for smart HTTP backend	2010-03-30 16:49:19 -07:00
git-http-fetch.txt
git-http-push.txt
git-imap-send.txt	Merge branch 'rr/imap-send-unconfuse-from-line'	2010-04-03 12:28:42 -07:00
git-index-pack.txt	Documentation: describe --thin more accurately	2010-02-18 17:13:18 -08:00
git-init-db.txt
git-init.txt	Add a "TEMPLATE DIRECTORY" section to git-init[1].	2010-02-17 12:17:53 -08:00
git-instaweb.txt	Document git-instaweb start/stop/restart	2010-08-02 15:18:18 -07:00
git-log.txt	Documentation/git-log: Clarify --full-diff	2010-08-09 11:53:32 -07:00
git-lost-found.txt
git-ls-files.txt	ls-files: learn a debugging dump format	2010-08-02 13:16:16 -07:00
git-ls-remote.txt
git-ls-tree.txt
git-mailinfo.txt	git-mailinfo documentation: clarify -u/--encoding	2010-06-13 20:18:23 -07:00
git-mailsplit.txt	documentation: 'git-mailsplit --keep-cr' is not hidden anymore	2010-02-28 11:04:19 -08:00
git-merge-base.txt
git-merge-file.txt	merge-file: add option to select union merge favor	2010-03-02 21:16:45 -08:00
git-merge-index.txt
git-merge-one-file.txt
git-merge-tree.txt
git-merge.txt	merge: --log appends shortlog to message if specified	2010-05-10 12:02:20 -07:00
git-mergetool--lib.txt
git-mergetool.txt	Documentation: Explain git-mergetool's use of temporary files	2010-07-19 09:16:09 -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	pack-objects documentation: Fix --honor-pack-keep as well.	2010-02-24 19:10:22 -08: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/git-push: Explain status output in more detail	2010-07-25 23:14:19 -07:00
git-quiltimport.txt
git-read-tree.txt	git-read-tree.txt: acknowledge the directory matching bug in sparse checkout	2010-07-25 23:14:18 -07:00
git-rebase.txt	Merge branch 'hv/autosquash-config'	2010-08-31 16:15:03 -07:00
git-receive-pack.txt
git-reflog.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00
git-relink.txt
git-remote-helpers.txt	Documentation/remote-helpers: Fix typos and improve language	2010-04-18 13:56:29 -07:00
git-remote.txt	Merge branch 'jn/remote-set-branches'	2010-06-18 11:16:55 -07:00
git-repack.txt
git-replace.txt
git-repo-config.txt
git-request-pull.txt	request-pull.txt: Document -p option	2010-07-25 21:52:19 -07:00
git-rerere.txt	rerere.txt: Document forget subcommand	2010-07-05 11:51:20 -07:00
git-reset.txt	Merge branch 'vs/doc-spell' into maint	2010-08-20 12:53:08 -07:00
git-rev-list.txt	Merge branch 'il/rev-glob'	2010-02-23 12:05:18 -08:00
git-rev-parse.txt	Documentation/rev-parse: quoting is required with --parseopt	2010-08-02 09:11:28 -07:00
git-revert.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00
git-rm.txt
git-send-email.txt	Merge branch 'tr/send-email-8bit' into maint	2010-06-28 16:19:03 -07:00
git-send-pack.txt	Documentation: describe --thin more accurately	2010-02-18 17:13:18 -08:00
git-sh-setup.txt
git-shell.txt
git-shortlog.txt	shortlog: Document and test --format option	2010-05-04 15:30:59 -07:00
git-show-branch.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00
git-show-index.txt
git-show-ref.txt	Documentation: add a FILES section for show-ref	2010-08-09 12:33:50 -07:00
git-show.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00
git-stage.txt
git-stash.txt	docs: don't talk about $GIT_DIR/refs/ everywhere	2010-02-17 21:40:09 -08: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 submodule add: Remove old docs about implicit -f	2010-07-19 11:11:07 -07:00
git-svn.txt	git svn: add an option to recode pathnames	2010-07-30 07:49:21 +00: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	Documentation: git-add does not update files marked "assume unchanged"	2010-05-08 11:12:28 -07:00
git-update-ref.txt
git-update-server-info.txt
git-upload-archive.txt
git-upload-pack.txt
git-var.txt	Fix 'git var' usage synopsis	2010-02-14 18:23:16 -08:00
git-verify-pack.txt
git-verify-tag.txt
git-web--browse.txt
git-whatchanged.txt
git-write-tree.txt
git.txt	Git 1.7.2.3	2010-09-03 09:38:53 -07:00
gitattributes.txt	Merge branch 'jn/merge-renormalize'	2010-09-03 09:43:41 -07:00
gitcli.txt
gitcore-tutorial.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00
gitcvs-migration.txt
gitdiffcore.txt	Documentation/gitdiffcore: fix order in pickaxe description	2010-05-18 21:55:11 -07:00
gitglossary.txt
githooks.txt	notes: implement helpers needed for note copying during rewrite	2010-03-12 21:55:39 -08:00
gitignore.txt	gitignore.5: Clarify matching rules	2010-05-31 18:11:10 -07:00
gitk.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00
gitmodules.txt	Typos in code comments, an error message, documentation	2010-08-22 13:26:13 -07:00
gitrepository-layout.txt	Documentation: spelling fixes	2010-07-20 16:59:17 -07:00
gitrevisions.txt	Documentation: gitrevisions	2010-07-05 13:39:02 -07:00
gittutorial-2.txt
gittutorial.txt
gitworkflows.txt
glossary-content.txt
howto-index.sh
i18n.txt
install-doc-quick.sh
install-webdoc.sh	install-webdoc: filter timestamp-only changes correctly	2010-09-01 09:25:17 -07:00
mailmap.txt
Makefile	Documentation: gitrevisions	2010-07-05 13:39:02 -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	Avoid conflicts when merging branches with mixed normalization	2010-07-02 15:43:15 -07:00
merge-options.txt	Merge branch 'maint'	2010-04-13 18:21:29 -07:00
merge-strategies.txt	merge-recursive --renormalize	2010-08-06 09:20:02 -07:00
pretty-formats.txt	pretty: Introduce ' ' modifier to add space if non-empty	2010-06-16 14:45:09 -07:00
pretty-options.txt	pretty-options.txt: match --format's documentation with implementation.	2010-08-05 09:49:49 -07:00
pull-fetch-param.txt
RelNotes-1.5.0.1.txt
RelNotes-1.5.0.2.txt
RelNotes-1.5.0.3.txt
RelNotes-1.5.0.4.txt
RelNotes-1.5.0.5.txt
RelNotes-1.5.0.6.txt
RelNotes-1.5.0.7.txt
RelNotes-1.5.0.txt
RelNotes-1.5.1.1.txt
RelNotes-1.5.1.2.txt
RelNotes-1.5.1.3.txt
RelNotes-1.5.1.4.txt
RelNotes-1.5.1.5.txt
RelNotes-1.5.1.6.txt
RelNotes-1.5.1.txt
RelNotes-1.5.2.1.txt
RelNotes-1.5.2.2.txt
RelNotes-1.5.2.3.txt
RelNotes-1.5.2.4.txt
RelNotes-1.5.2.5.txt
RelNotes-1.5.2.txt
RelNotes-1.5.3.1.txt
RelNotes-1.5.3.2.txt
RelNotes-1.5.3.3.txt
RelNotes-1.5.3.4.txt
RelNotes-1.5.3.5.txt
RelNotes-1.5.3.6.txt
RelNotes-1.5.3.7.txt
RelNotes-1.5.3.8.txt
RelNotes-1.5.3.txt
RelNotes-1.5.4.1.txt
RelNotes-1.5.4.2.txt
RelNotes-1.5.4.3.txt
RelNotes-1.5.4.4.txt
RelNotes-1.5.4.5.txt
RelNotes-1.5.4.6.txt
RelNotes-1.5.4.7.txt
RelNotes-1.5.4.txt
RelNotes-1.5.5.1.txt
RelNotes-1.5.5.2.txt
RelNotes-1.5.5.3.txt
RelNotes-1.5.5.4.txt
RelNotes-1.5.5.5.txt
RelNotes-1.5.5.6.txt
RelNotes-1.5.5.txt
RelNotes-1.5.6.1.txt
RelNotes-1.5.6.2.txt
RelNotes-1.5.6.3.txt	Typos in code comments, an error message, documentation	2010-08-22 13:25:08 -07:00
RelNotes-1.5.6.4.txt
RelNotes-1.5.6.5.txt
RelNotes-1.5.6.6.txt
RelNotes-1.5.6.txt
RelNotes-1.6.0.1.txt
RelNotes-1.6.0.2.txt	Typos in code comments, an error message, documentation	2010-08-22 13:25:08 -07:00
RelNotes-1.6.0.3.txt
RelNotes-1.6.0.4.txt
RelNotes-1.6.0.5.txt
RelNotes-1.6.0.6.txt
RelNotes-1.6.0.txt
RelNotes-1.6.1.1.txt
RelNotes-1.6.1.2.txt
RelNotes-1.6.1.3.txt
RelNotes-1.6.1.4.txt
RelNotes-1.6.1.txt
RelNotes-1.6.2.1.txt
RelNotes-1.6.2.2.txt
RelNotes-1.6.2.3.txt
RelNotes-1.6.2.4.txt
RelNotes-1.6.2.5.txt
RelNotes-1.6.2.txt
RelNotes-1.6.3.1.txt
RelNotes-1.6.3.2.txt
RelNotes-1.6.3.3.txt
RelNotes-1.6.3.4.txt
RelNotes-1.6.3.txt
RelNotes-1.6.4.1.txt
RelNotes-1.6.4.2.txt
RelNotes-1.6.4.3.txt	Typos in code comments, an error message, documentation	2010-08-22 13:25:08 -07:00
RelNotes-1.6.4.4.txt
RelNotes-1.6.4.txt
RelNotes-1.6.5.1.txt
RelNotes-1.6.5.2.txt
RelNotes-1.6.5.3.txt
RelNotes-1.6.5.4.txt	Typos in code comments, an error message, documentation	2010-08-22 13:25:08 -07:00
RelNotes-1.6.5.5.txt
RelNotes-1.6.5.6.txt
RelNotes-1.6.5.7.txt	Typos in code comments, an error message, documentation	2010-08-22 13:25:08 -07:00
RelNotes-1.6.5.8.txt
RelNotes-1.6.5.txt
RelNotes-1.6.6.1.txt
RelNotes-1.6.6.2.txt	Fix typo in 1.6.6.2 release notes	2010-02-12 15:40:01 -08:00
RelNotes-1.6.6.txt	Typos in code comments, an error message, documentation	2010-08-22 13:25:08 -07:00
RelNotes-1.7.0.1.txt	Git 1.7.0.1	2010-02-28 11:41:24 -08:00
RelNotes-1.7.0.2.txt	Git 1.7.0.2	2010-03-07 11:07:51 -08:00
RelNotes-1.7.0.3.txt	Git 1.7.0.3	2010-03-21 17:01:22 -07:00
RelNotes-1.7.0.4.txt	Git 1.7.0.4	2010-03-31 15:12:08 -07:00
RelNotes-1.7.0.5.txt	Git 1.7.0.5	2010-04-11 13:42:33 -07:00
RelNotes-1.7.0.6.txt	Git 1.7.0.6	2010-04-22 23:04:21 -07:00
RelNotes-1.7.0.7.txt	Git 1.7.0.7	2010-07-27 14:09:11 -07:00
RelNotes-1.7.0.txt	Typos in code comments, an error message, documentation	2010-08-22 13:25:08 -07:00
RelNotes-1.7.1.1.txt	Git 1.7.1.1	2010-06-29 09:59:56 -07:00
RelNotes-1.7.1.2.txt	Git 1.7.1.2	2010-07-27 16:36:51 -07:00
RelNotes-1.7.1.txt	Git 1.7.1	2010-04-23 18:27:17 -07:00
RelNotes-1.7.2.1.txt	Git 1.7.2.1	2010-07-27 16:42:53 -07:00
RelNotes-1.7.2.2.txt	Git 1.7.2.2	2010-08-19 16:03:18 -07:00
RelNotes-1.7.2.3.txt	Git 1.7.2.3	2010-09-03 09:38:53 -07:00
RelNotes-1.7.2.txt	Git 1.7.2	2010-07-21 12:55:50 -07:00
RelNotes-1.7.3.txt	Prepare for 1.7.3	2010-09-01 15:11:07 -07:00
rev-list-options.txt	Merge branch 'tr/rev-list-count'	2010-06-30 11:55:38 -07:00
revisions.txt	Documentation: split off rev doc into include file	2010-07-05 13:38:10 -07:00
SubmittingPatches	SubmittingPatches: Cite the 50 char subject limit	2010-07-28 13:51:33 -07:00
urls-remotes.txt
urls.txt	Documentation: spelling fixes	2010-07-20 16:59:17 -07:00
user-manual.conf
user-manual.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00