Junio C Hamano 8e89b3c306 Merge branch 'master' into next ...

* master:
  Update draft release notes to 1.8.0
  Git 1.7.12.2
  l10n: de.po: correct translation of a 'rebase' message
  l10n: Fixes to Swedish translation
  Update Swedish translation (1967t0f0u)
  l10n: zh.CN.po: msgmerge git.pot (1142t195f630u)
  l10n: Update git.pot (825 new, 24 removed messages)
  l10n: Improve many translation for zh_CN
  l10n: Unify the translation for '(un)expected'

2012-09-29 23:29:44 -07:00

..

howto

…

pt_BR

…

RelNotes

Update draft release notes to 1.8.0

2012-09-29 23:25:09 -07:00

technical

Merge branch 'dj/fetch-all-tags' into maint

2012-09-24 12:39:21 -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

…

config.txt

Merge branch 'maint'

2012-09-17 15:59:34 -07:00

date-formats.txt

…

diff-config.txt

…

diff-format.txt

…

diff-generate-patch.txt

…

diff-options.txt

…

docbook-xsl.css

…

docbook.xsl

…

everyday.txt

…

fetch-options.txt

Doc: shallow clone deepens _to_ new depth

2012-09-18 21:47:12 -07:00

fix-texi.perl

…

git-add.txt

Doc add: link gitignore

2012-09-18 21:49:46 -07:00

git-am.txt

…

git-annotate.txt

…

git-apply.txt

…

git-archimport.txt

…

git-archive.txt

…

git-bisect-lk2009.txt

…

git-bisect.txt

…

git-blame.txt

git blame: document that it always follows origin across whole-file renames

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

git-branch.txt

Merge branch 'po/maint-docs'

2012-09-25 10:39:52 -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' into maint-1.7.11

2012-09-14 20:45:03 -07:00

git-cherry-pick.txt

…

git-cherry.txt

…

git-citool.txt

…

git-clean.txt

Doc clean: add See Also link

2012-09-18 21:49:50 -07:00

git-clone.txt

Merge branch 'rt/maint-clone-single' into next

2012-09-27 18:00:09 -07:00

git-column.txt

…

git-commit-tree.txt

…

git-commit.txt

Documentation: describe subject more precisely

2012-09-13 21:30:21 -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

…

git-credential-cache.txt

…

git-credential-store.txt

…

git-credential.txt

…

git-cvsexportcommit.txt

…

git-cvsimport.txt

…

git-cvsserver.txt

…

git-daemon.txt

…

git-describe.txt

…

git-diff-files.txt

…

git-diff-index.txt

…

git-diff-tree.txt

…

git-diff.txt

…

git-difftool.txt

…

git-fast-export.txt

…

git-fast-import.txt

Merge branch 'er/doc-fast-import-done' into maint

2012-09-18 14:33:52 -07:00

git-fetch-pack.txt

…

git-fetch.txt

…

git-filter-branch.txt

Documentation/git-filter-branch: Move note about effect of removing commits

2012-09-18 12:51:58 -07:00

git-fmt-merge-msg.txt

…

git-for-each-ref.txt

Documentation: describe subject more precisely

2012-09-13 21:30:21 -07:00

git-format-patch.txt

Documentation: describe subject more precisely

2012-09-13 21:30:21 -07:00

git-fsck-objects.txt

…

git-fsck.txt

…

git-gc.txt

…

git-get-tar-commit-id.txt

…

git-grep.txt

…

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

…

git-lost-found.txt

…

git-ls-files.txt

…

git-ls-remote.txt

…

git-ls-tree.txt

…

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

…

git-mv.txt

…

git-name-rev.txt

…

git-notes.txt

…

git-p4.txt

git-p4: add submit --conflict option and config varaiable

2012-09-16 21:52:53 -07:00

git-pack-objects.txt

…

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

…

git-pull.txt

…

git-push.txt

…

git-quiltimport.txt

…

git-read-tree.txt

…

git-rebase.txt

rebase -i: Teach "--edit-todo" action

2012-09-17 20:59:14 -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

…

git-repack.txt

…

git-replace.txt

…

git-repo-config.txt

…

git-request-pull.txt

…

git-rerere.txt

…

git-reset.txt

…

git-rev-list.txt

…

git-rev-parse.txt

…

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

Documentation: describe subject more precisely

2012-09-13 21:30:21 -07:00

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

submodule: if $command was not matched, don't parse other args

2012-09-25 11:31:48 -07:00

git-svn.txt

…

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

…

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

Git 1.7.12.2

2012-09-29 23:20:47 -07:00

gitattributes.txt

Merge branch 'aj/xfuncname-ada'

2012-09-25 10:40:11 -07:00

gitcli.txt

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

2012-09-14 20:45:03 -07:00

gitcore-tutorial.txt

Documentation: describe subject more precisely

2012-09-13 21:30:21 -07:00

gitcredentials.txt

…

gitcvs-migration.txt

…

gitdiffcore.txt

…

gitglossary.txt

…

githooks.txt

…

gitignore.txt

Doc: separate gitignore pattern sources

2012-09-18 21:47:45 -07:00

gitk.txt

…

gitmodules.txt

…

gitnamespaces.txt

…

gitrepository-layout.txt

…

gitrevisions.txt

…

gittutorial-2.txt

…

gittutorial.txt

Documentation: describe subject more precisely

2012-09-13 21:30:21 -07:00

gitweb.conf.txt

…

gitweb.txt

…

gitworkflows.txt

…

glossary-content.txt

…

howto-index.sh

…

i18n.txt

…

install-doc-quick.sh

…

install-webdoc.sh

…

mailmap.txt

…

Makefile

Documentation/Makefile: Allow custom XMLTO binary

2012-09-19 16:35:10 -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

Documentation: Document signature showing options

2012-09-20 10:28:51 -07:00

pretty-options.txt

Documentation: Document signature showing options

2012-09-20 10:28:51 -07:00

pull-fetch-param.txt

…

rev-list-options.txt

Merge branch 'jc/maint-log-grep-all-match-1' into maint

2012-09-29 22:30:56 -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

…

user-manual.txt

Documentation: describe subject more precisely

2012-09-13 21:30:21 -07:00