Junio C Hamano 21bed620cd Merge branch 'jc/renormalize-merge-kill-safer-crlf' ...

"git merge" with renormalization did not work well with
merge-recursive, due to "safer crlf" conversion kicking in when it
shouldn't.

* jc/renormalize-merge-kill-safer-crlf:
  merge: avoid "safer crlf" during recording of merge results
  convert: unify the "auto" handling of CRLF

2016-07-25 14:13:39 -07:00

..

howto

new-command.txt: correct the command description file

2016-06-27 06:11:57 -07:00

RelNotes

Sixth batch of topics for 2.10

2016-07-19 13:26:16 -07:00

technical

…

.gitattributes

…

.gitignore

…

asciidoc.conf

…

blame-options.txt

…

build-docdep.perl

…

cat-texi.perl

…

cmd-list.perl

…

CodingGuidelines

CodingGuidelines: formatting HEAD in documentation

2016-06-28 08:36:45 -07:00

config.txt

Merge branch 'jc/renormalize-merge-kill-safer-crlf'

2016-07-25 14:13:39 -07:00

date-formats.txt

…

diff-config.txt

Merge branch 'mm/doc-tt'

2016-07-13 11:24:14 -07:00

diff-format.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

diff-generate-patch.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

diff-options.txt

…

docbook-xsl.css

…

docbook.xsl

…

everyday.txto

…

fetch-options.txt

Merge branch 'mm/doc-tt'

2016-07-13 11:24:14 -07:00

fix-texi.perl

…

fmt-merge-msg-config.txt

…

git-add.txt

…

git-am.txt

Merge branch 'mm/doc-tt'

2016-07-13 11:24:14 -07:00

git-annotate.txt

…

git-apply.txt

…

git-archimport.txt

…

git-archive.txt

…

git-bisect-lk2009.txt

…

git-bisect.txt

doc: typeset HEAD and variants as literal

2016-06-28 08:36:45 -07:00

git-blame.txt

…

git-branch.txt

doc: typeset HEAD and variants as literal

2016-06-28 08:36:45 -07:00

git-bundle.txt

…

git-cat-file.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-check-attr.txt

…

git-check-ignore.txt

…

git-check-mailmap.txt

…

git-check-ref-format.txt

…

git-checkout-index.txt

…

git-checkout.txt

doc: typeset short command-line options as literal

2016-06-28 08:20:52 -07:00

git-cherry-pick.txt

Merge branch 'mm/doc-tt'

2016-07-13 11:24:14 -07:00

git-cherry.txt

…

git-citool.txt

…

git-clean.txt

doc: typeset short command-line options as literal

2016-06-28 08:20:52 -07:00

git-clone.txt

Merge branch 'sb/clone-shallow-passthru' into maint

2016-07-11 10:44:12 -07:00

git-column.txt

…

git-commit-tree.txt

Merge branch 'mm/doc-tt'

2016-07-13 11:24:14 -07:00

git-commit.txt

Merge branch 'mm/doc-tt'

2016-07-13 11:24:14 -07:00

git-config.txt

doc: typeset long options with argument as literal

2016-06-28 08:36:45 -07:00

git-count-objects.txt

…

git-credential-cache--daemon.txt

…

git-credential-cache.txt

…

git-credential-store.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-credential.txt

…

git-cvsexportcommit.txt

…

git-cvsimport.txt

doc: typeset HEAD and variants as literal

2016-06-28 08:36:45 -07:00

git-cvsserver.txt

doc: typeset HEAD and variants as literal

2016-06-28 08:36:45 -07:00

git-daemon.txt

doc: typeset HEAD and variants as literal

2016-06-28 08:36:45 -07:00

git-describe.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-diff-files.txt

…

git-diff-index.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-diff-tree.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-diff.txt

…

git-difftool.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-fast-export.txt

…

git-fast-import.txt

Merge branch 'mm/doc-tt'

2016-07-13 11:24:14 -07:00

git-fetch-pack.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-fetch.txt

fetch: reduce duplicate in ref update status lines with placeholder

2016-07-06 11:48:25 -07:00

git-filter-branch.txt

doc: typeset '--' as literal

2016-06-28 08:36:45 -07:00

git-fmt-merge-msg.txt

…

git-for-each-ref.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-format-patch.txt

Merge branch 'tr/doc-tt' into maint

2016-07-06 13:06:34 -07:00

git-fsck-objects.txt

…

git-fsck.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-gc.txt

…

git-get-tar-commit-id.txt

…

git-grep.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-gui.txt

doc: typeset HEAD and variants as literal

2016-06-28 08:36:45 -07:00

git-hash-object.txt

…

git-help.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-http-backend.txt

…

git-http-fetch.txt

…

git-http-push.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-imap-send.txt

…

git-index-pack.txt

…

git-init-db.txt

…

git-init.txt

Merge branch 'tr/doc-tt' into maint

2016-07-06 13:06:34 -07:00

git-instaweb.txt

…

git-interpret-trailers.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-log.txt

Merge branch 'mj/log-show-signature-conf'

2016-07-11 10:31:08 -07:00

git-ls-files.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-ls-remote.txt

…

git-ls-tree.txt

doc: typeset HEAD and variants as literal

2016-06-28 08:36:45 -07:00

git-mailinfo.txt

…

git-mailsplit.txt

…

git-merge-base.txt

…

git-merge-file.txt

…

git-merge-index.txt

…

git-merge-one-file.txt

…

git-merge-tree.txt

…

git-merge.txt

…

git-mergetool--lib.txt

…

git-mergetool.txt

…

git-mktag.txt

…

git-mktree.txt

doc: typeset short command-line options as literal

2016-06-28 08:20:52 -07:00

git-mv.txt

doc: typeset short command-line options as literal

2016-06-28 08:20:52 -07:00

git-name-rev.txt

…

git-notes.txt

doc: typeset short command-line options as literal

2016-06-28 08:20:52 -07:00

git-p4.txt

Merge branch 'mm/doc-tt'

2016-07-13 11:24:14 -07:00

git-pack-objects.txt

…

git-pack-redundant.txt

…

git-pack-refs.txt

…

git-parse-remote.txt

…

git-patch-id.txt

…

git-prune-packed.txt

…

git-prune.txt

…

git-pull.txt

…

git-push.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-quiltimport.txt

…

git-read-tree.txt

…

git-rebase.txt

Merge branch 'mm/doc-tt'

2016-07-13 11:24:14 -07:00

git-receive-pack.txt

…

git-reflog.txt

…

git-relink.txt

…

git-remote-ext.txt

…

git-remote-fd.txt

…

git-remote-helpers.txto

…

git-remote-testgit.txt

…

git-remote.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-repack.txt

Merge branch 'mm/doc-tt'

2016-07-13 11:24:14 -07:00

git-replace.txt

…

git-request-pull.txt

…

git-rerere.txt

…

git-reset.txt

…

git-rev-list.txt

…

git-rev-parse.txt

…

git-revert.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-rm.txt

…

git-send-email.txt

Merge branch 'mm/doc-tt'

2016-07-13 11:24:14 -07:00

git-send-pack.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-sh-i18n--envsubst.txt

…

git-sh-i18n.txt

…

git-sh-setup.txt

…

git-shell.txt

doc: typeset short command-line options as literal

2016-06-28 08:20:52 -07:00

git-shortlog.txt

…

git-show-branch.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-show-index.txt

…

git-show-ref.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-show.txt

…

git-stage.txt

…

git-stash.txt

…

git-status.txt

…

git-stripspace.txt

…

git-submodule.txt

…

git-svn.txt

Merge branch 'mm/doc-tt'

2016-07-13 11:24:14 -07:00

git-symbolic-ref.txt

…

git-tag.txt

Merge branch 'mm/doc-tt'

2016-07-13 11:24:14 -07:00

git-tools.txt

…

git-unpack-file.txt

…

git-unpack-objects.txt

…

git-update-index.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-update-ref.txt

…

git-update-server-info.txt

…

git-upload-archive.txt

…

git-upload-pack.txt

…

git-var.txt

…

git-verify-commit.txt

Merge branch 'dn/gpg-doc' into maint

2016-07-06 13:06:36 -07:00

git-verify-pack.txt

…

git-verify-tag.txt

…

git-web--browse.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-whatchanged.txt

…

git-worktree.txt

Merge branch 'nd/worktree-cleanup-post-head-protection'

2016-07-06 13:38:11 -07:00

git-write-tree.txt

…

git.txt

Sync with 2.9.2

2016-07-15 10:49:23 -07:00

gitattributes.txt

Merge branch 'jc/renormalize-merge-kill-safer-crlf'

2016-07-25 14:13:39 -07:00

gitcli.txt

…

gitcore-tutorial.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

gitcredentials.txt

…

gitcvs-migration.txt

…

gitdiffcore.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

giteveryday.txt

…

gitglossary.txt

…

githooks.txt

…

gitignore.txt

…

gitk.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

gitmodules.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

gitnamespaces.txt

…

gitremote-helpers.txt

doc: typeset HEAD and variants as literal

2016-06-28 08:36:45 -07:00

gitrepository-layout.txt

…

gitrevisions.txt

…

gittutorial-2.txt

…

gittutorial.txt

…

gitweb.conf.txt

…

gitweb.txt

…

gitworkflows.txt

…

glossary-content.txt

…

howto-index.sh

…

i18n.txt

…

install-doc-quick.sh

…

install-webdoc.sh

…

line-range-format.txt

…

lint-gitlink.perl

…

mailmap.txt

…

Makefile

…

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-options.txt

…

merge-strategies.txt

…

pretty-formats.txt

…

pretty-options.txt

Merge branch 'tr/doc-tt' into maint

2016-07-06 13:06:34 -07:00

pull-fetch-param.txt

…

rev-list-options.txt

doc: typeset '--' as literal

2016-06-28 08:36:45 -07:00

revisions.txt

doc: typeset HEAD and variants as literal

2016-06-28 08:36:45 -07:00

sequencer.txt

…

SubmittingPatches

…

urls-remotes.txt

…

urls.txt

…

user-manual.conf

…

user-manual.txt

…