Junio C Hamano 9a7a6b325f Merge branch 'jc/ll-merge-binary-ours' into next ...

"git merge -Xtheirs" did not help content-level merge of binary
files; it should just take their version.  Also "*.jpg binary" in
the attributes did not imply they should use the binary ll-merge
driver.

* jc/ll-merge-binary-ours:
  ll-merge: warn about inability to merge binary files only when we can't
  attr: "binary" attribute should choose built-in "binary" merge driver
  merge: teach -Xours/-Xtheirs to binary ll-merge driver

2012-09-12 14:54:41 -07:00

..

howto

…

pt_BR

…

RelNotes

Start merging the sixth batch for 1.8.0

2012-09-12 14:37:07 -07:00

technical

Merge branch 'jk/argv-array'

2012-09-11 11:36:18 -07:00

.gitattributes

…

.gitignore

…

asciidoc.conf

Merge branch 'jk/docs-docbook-monospace-display' into maint-1.7.11

2012-09-11 11:08:40 -07:00

blame-options.txt

…

build-docdep.perl

…

cat-texi.perl

…

cmd-list.perl

…

CodingGuidelines

Documentation/CodingGuidelines: spell out more shell guidelines

2012-08-15 11:00:39 -07:00

config.txt

Merge branch 'js/grep-patterntype-config'

2012-08-27 11:55:09 -07:00

date-formats.txt

…

diff-config.txt

Documentation: spelling fixes

2012-06-19 11:35:19 -07:00

diff-format.txt

…

diff-generate-patch.txt

…

diff-options.txt

Documentation: Fix misspellings

2012-06-22 14:25:04 -07:00

docbook-xsl.css

…

docbook.xsl

…

everyday.txt

…

fetch-options.txt

…

fix-texi.perl

…

git-add.txt

…

git-am.txt

…

git-annotate.txt

…

git-apply.txt

apply: document --3way option

2012-07-09 14:40:03 -07:00

git-archimport.txt

…

git-archive.txt

…

git-bisect-lk2009.txt

…

git-bisect.txt

…

git-blame.txt

…

git-branch.txt

branch: add --unset-upstream option

2012-08-30 12:07:28 -07:00

git-bundle.txt

…

git-cat-file.txt

…

git-check-attr.txt

…

git-check-ref-format.txt

…

git-checkout-index.txt

…

git-checkout.txt

Merge branch 'jc/maint-checkout-fileglob-doc'

2012-09-12 14:22:08 -07:00

git-cherry-pick.txt

Merge branch 'cw/cherry-pick-allow-empty-message'

2012-09-03 15:53:37 -07:00

git-cherry.txt

…

git-citool.txt

…

git-clean.txt

…

git-clone.txt

…

git-column.txt

Documentation: spelling fixes

2012-06-19 11:35:19 -07:00

git-commit-tree.txt

Revert "git-commit-tree(1): update synopsis"

2012-07-17 13:11:03 -07:00

git-commit.txt

Merge branch 'rr/doc-commit' into maint

2012-08-06 15:37:09 -07:00

git-config.txt

Sync with 1.7.11.6

2012-09-11 11:23:54 -07:00

git-count-objects.txt

…

git-credential-cache--daemon.txt

command-list: mention git-credential-* helpers

2012-08-08 12:11:54 -07:00

git-credential-cache.txt

command-list: mention git-credential-* helpers

2012-08-08 12:11:54 -07:00

git-credential-store.txt

command-list: mention git-credential-* helpers

2012-08-08 12:11:54 -07:00

git-credential.txt

Documentation: list git-credential in plumbing commands

2012-08-08 09:59:17 -07:00

git-cvsexportcommit.txt

…

git-cvsimport.txt

…

git-cvsserver.txt

…

git-daemon.txt

Merge branch 'jc/daemon-access-hook'

2012-09-03 15:54:03 -07:00

git-describe.txt

Documentation: do not mention .git/refs/* directories

2012-08-06 14:04:16 -07:00

git-diff-files.txt

…

git-diff-index.txt

…

git-diff-tree.txt

…

git-diff.txt

…

git-difftool.txt

mergetool,difftool: Document --tool-help consistently

2012-08-10 08:07:41 -07:00

git-fast-export.txt

…

git-fast-import.txt

…

git-fetch-pack.txt

…

git-fetch.txt

…

git-filter-branch.txt

Merge branch 'jc/tag-doc' into maint-1.7.11

2012-08-24 12:05:30 -07:00

git-fmt-merge-msg.txt

…

git-for-each-ref.txt

…

git-format-patch.txt

…

git-fsck-objects.txt

…

git-fsck.txt

Merge branch 'jc/tag-doc' into maint-1.7.11

2012-08-24 12:05:30 -07:00

git-gc.txt

…

git-get-tar-commit-id.txt

…

git-grep.txt

grep: add a grep.patternType configuration setting

2012-08-03 09:58:02 -07:00

git-gui.txt

…

git-hash-object.txt

…

git-help.txt

…

git-http-backend.txt

…

git-http-fetch.txt

…

git-http-push.txt

…

git-imap-send.txt

…

git-index-pack.txt

…

git-init-db.txt

…

git-init.txt

…

git-instaweb.txt

…

git-log.txt

doc: move rev-list option -<n> from git-log.txt to rev-list-options.txt

2012-09-06 13:26:50 -07:00

git-lost-found.txt

Documentation: do not mention .git/refs/* directories

2012-08-06 14:04:16 -07:00

git-ls-files.txt

…

git-ls-remote.txt

ls-remote: document the '--get-url' option

2012-09-07 10:58:35 -07:00

git-ls-tree.txt

…

git-mailinfo.txt

…

git-mailsplit.txt

…

git-merge-base.txt

merge-base: "--is-ancestor A B"

2012-08-31 11:45:33 -07:00

git-merge-file.txt

…

git-merge-index.txt

…

git-merge-one-file.txt

…

git-merge-tree.txt

…

git-merge.txt

doc: A few minor copy edits.

2012-08-06 15:34:20 -07:00

git-mergetool--lib.txt

…

git-mergetool.txt

Merge branch 'da/difftool-updates'

2012-08-27 11:55:17 -07:00

git-mktag.txt

…

git-mktree.txt

…

git-mv.txt

…

git-name-rev.txt

…

git-notes.txt

…

git-p4.txt

git p4: refactor diffOpts calculation

2012-07-05 23:23:28 -07:00

git-pack-objects.txt

…

git-pack-redundant.txt

…

git-pack-refs.txt

Merge branch 'jc/tag-doc' into maint-1.7.11

2012-08-24 12:05:30 -07:00

git-parse-remote.txt

…

git-patch-id.txt

…

git-peek-remote.txt

…

git-prune-packed.txt

…

git-prune.txt

…

git-pull.txt

man: git pull -r is a short for --rebase

2012-08-17 00:26:52 -07:00

git-push.txt

…

git-quiltimport.txt

…

git-read-tree.txt

…

git-rebase.txt

doc: A few minor copy edits.

2012-08-06 15:34:20 -07:00

git-receive-pack.txt

…

git-reflog.txt

…

git-relink.txt

…

git-remote-ext.txt

…

git-remote-fd.txt

…

git-remote-helpers.txt

…

git-remote-testgit.txt

…

git-remote.txt

remote: prefer subcommand name 'remove' to 'rm'

2012-09-06 13:23:22 -07:00

git-repack.txt

…

git-replace.txt

Documentation: do not mention .git/refs/* directories

2012-08-06 14:04:16 -07:00

git-repo-config.txt

…

git-request-pull.txt

…

git-rerere.txt

…

git-reset.txt

…

git-rev-list.txt

…

git-rev-parse.txt

Merge branch 'jc/sha1-name-more'

2012-07-22 12:55:07 -07:00

git-revert.txt

…

git-rm.txt

…

git-send-email.txt

…

git-send-pack.txt

…

git-sh-i18n--envsubst.txt

…

git-sh-i18n.txt

…

git-sh-setup.txt

…

git-shell.txt

…

git-shortlog.txt

…

git-show-branch.txt

…

git-show-index.txt

…

git-show-ref.txt

…

git-show.txt

…

git-stage.txt

…

git-stash.txt

…

git-status.txt

…

git-stripspace.txt

…

git-submodule.txt

Make 'git submodule update --force' always check out submodules.

2012-08-24 09:00:43 -07:00

git-svn.txt

…

git-symbolic-ref.txt

…

git-tag.txt

Merge branch 'jc/tag-doc' into maint-1.7.11

2012-08-24 12:05:30 -07:00

git-tar-tree.txt

…

git-tools.txt

…

git-unpack-file.txt

…

git-unpack-objects.txt

…

git-update-index.txt

…

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

…

git-whatchanged.txt

…

git-write-tree.txt

…

git.txt

Sync with 1.7.11.6

2012-09-11 11:23:54 -07:00

gitattributes.txt

Merge branch 'jc/ll-merge-binary-ours' into next

2012-09-12 14:54:41 -07:00

gitcli.txt

Merge branch 'jc/maint-checkout-fileglob-doc'

2012-09-12 14:22:08 -07:00

gitcore-tutorial.txt

…

gitcredentials.txt

…

gitcvs-migration.txt

…

gitdiffcore.txt

…

gitglossary.txt

…

githooks.txt

…

gitignore.txt

Let core.excludesfile default to $XDG_CONFIG_HOME/git/ignore

2012-06-25 09:06:15 -07:00

gitk.txt

…

gitmodules.txt

…

gitnamespaces.txt

…

gitrepository-layout.txt

…

gitrevisions.txt

…

gittutorial-2.txt

…

gittutorial.txt

…

gitweb.conf.txt

Documentation: spelling fixes

2012-06-19 11:35:19 -07:00

gitweb.txt

…

gitworkflows.txt

…

glossary-content.txt

doc: A few minor copy edits.

2012-08-06 15:34:20 -07:00

howto-index.sh

…

i18n.txt

…

install-doc-quick.sh

…

install-webdoc.sh

…

mailmap.txt

…

Makefile

check-docs: get documented command list from Makefile

2012-08-08 14:32:17 -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-options.txt

…

merge-strategies.txt

merge: teach -Xours/-Xtheirs to binary ll-merge driver

2012-09-08 21:27:19 -07:00

pretty-formats.txt

…

pretty-options.txt

…

pull-fetch-param.txt

…

rev-list-options.txt

Merge branch 'nd/log-n-doc'

2012-09-12 14:21:55 -07:00

revisions.txt

Merge branch 'nd/branch-v-alignment'

2012-09-07 11:10:02 -07:00

sequencer.txt

…

SubmittingPatches

…

urls-remotes.txt

…

urls.txt

…

user-manual.conf

docs: monospace listings in docbook output

2012-08-07 14:30:52 -07:00

user-manual.txt

doc: A few minor copy edits.

2012-08-06 15:34:20 -07:00