Junio C Hamano 10b2a48113 Merge branch 'maint' ...

* maint:
  Git 1.7.7.1
  RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting

Conflicts:
	GIT-VERSION-GEN

2011-10-23 21:49:14 -07:00

..

howto

Minor update to how-to maintain git

2011-09-07 11:18:18 -07:00

pt_BR

…

RelNotes

Merge branch 'maint'

2011-10-23 21:49:14 -07:00

technical

Merge branch 'nd/document-err-packet'

2011-10-12 12:34:18 -07:00

.gitattributes

…

.gitignore

…

asciidoc.conf

…

blame-options.txt

use -h for synopsis and --help for manpage consistently

2011-10-05 10:47:10 -07:00

build-docdep.perl

…

cat-texi.perl

…

cmd-list.perl

…

CodingGuidelines

…

config.txt

Merge branch 'po/insn-editor'

2011-10-21 16:04:37 -07:00

date-formats.txt

…

diff-config.txt

…

diff-format.txt

…

diff-generate-patch.txt

…

diff-options.txt

Merge branch 'rs/diff-whole-function'

2011-10-19 10:49:13 -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

…

git-archimport.txt

…

git-archive.txt

…

git-bisect-lk2009.txt

…

git-bisect.txt

…

git-blame.txt

…

git-branch.txt

branch: -v does not automatically imply --list

2011-09-08 14:11:35 -07:00

git-bundle.txt

…

git-cat-file.txt

…

git-check-attr.txt

Teach '--cached' option to check-attr

2011-09-22 16:38:22 -07:00

git-check-ref-format.txt

Change check_refname_format() to reject unnormalized refnames

2011-10-05 13:45:30 -07:00

git-checkout-index.txt

…

git-checkout.txt

…

git-cherry-pick.txt

Merge branch 'rr/revert-cherry-pick-continue'

2011-10-05 12:36:19 -07:00

git-cherry.txt

…

git-citool.txt

…

git-clean.txt

…

git-clone.txt

…

git-commit-tree.txt

Merge branch 'jn/ident-from-etc-mailname'

2011-10-13 19:03:24 -07:00

git-commit.txt

…

git-config.txt

…

git-count-objects.txt

…

git-cvsexportcommit.txt

…

git-cvsimport.txt

…

git-cvsserver.txt

…

git-daemon.txt

daemon: give friendlier error messages to clients

2011-10-15 21:15:06 -07:00

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

…

git-fetch-pack.txt

…

git-fetch.txt

…

git-filter-branch.txt

…

git-fmt-merge-msg.txt

…

git-for-each-ref.txt

for-each-ref: add split message parts to %(contents:*).

2011-09-08 13:56:19 -07:00

git-format-patch.txt

…

git-fsck-objects.txt

…

git-fsck.txt

…

git-gc.txt

…

git-get-tar-commit-id.txt

…

git-grep.txt

Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude

2011-10-04 18:40:41 -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

Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages

2011-10-16 11:09:35 -07:00

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

Merge branch 'jn/doc-dashdash' into maint

2011-09-11 21:52:18 -07:00

git-mergetool.txt

Merge branch 'jm/mergetool-pathspec'

2011-10-10 15:56:18 -07:00

git-mktag.txt

…

git-mktree.txt

…

git-mv.txt

…

git-name-rev.txt

…

git-notes.txt

…

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

Merge branch 'nd/sparse-doc'

2011-10-10 15:56:20 -07:00

git-rebase.txt

…

git-receive-pack.txt

Sync with 1.7.6.2

2011-09-06 11:42:12 -07:00

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

Merge branch 'rr/revert-cherry-pick-continue'

2011-10-05 12:36:19 -07:00

git-rm.txt

…

git-send-email.txt

…

git-send-pack.txt

Revert "Merge branch 'cb/maint-quiet-push' into maint"

2011-09-06 11:10:41 -07:00

git-sh-i18n--envsubst.txt

…

git-sh-i18n.txt

Merge branch 'jn/doc-dashdash' into maint

2011-09-11 21:52:18 -07:00

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

Merge branch 'jk/maint-1.7.2-status-ignored' into maint

2011-09-11 21:51:10 -07:00

git-stripspace.txt

…

git-submodule.txt

Merge branch 'jn/doc-dashdash' into maint

2011-09-11 21:52:18 -07:00

git-svn.txt

git svn dcommit: new option --interactive.

2011-10-16 08:12:26 +00:00

git-symbolic-ref.txt

…

git-tag.txt

Merge branch 'mg/branch-list'

2011-10-05 12:36:23 -07:00

git-tar-tree.txt

…

git-tools.txt

…

git-unpack-file.txt

…

git-unpack-objects.txt

…

git-update-index.txt

Merge branch 'sn/doc-update-index-assume-unchanged'

2011-10-05 12:36:25 -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

Merge branch 'jn/doc-dashdash' into maint

2011-09-11 21:52:18 -07:00

git-whatchanged.txt

…

git-write-tree.txt

…

git.txt

Git 1.7.7.1

2011-10-23 21:48:06 -07:00

gitattributes.txt

…

gitcli.txt

…

gitcore-tutorial.txt

…

gitcvs-migration.txt

…

gitdiffcore.txt

…

gitglossary.txt

…

githooks.txt

…

gitignore.txt

…

gitk.txt

…

gitmodules.txt

…

gitnamespaces.txt

Documentation/gitnamespaces.txt: cater to older asciidoc

2011-09-16 09:20:23 -07:00

gitrepository-layout.txt

…

gitrevisions.txt

…

gittutorial-2.txt

…

gittutorial.txt

…

gitweb.conf.txt

gitweb: Add gitweb(1) manpage for gitweb itself

2011-10-16 11:09:34 -07:00

gitweb.txt

gitweb: Add gitweb(1) manpage for gitweb itself

2011-10-16 11:09:34 -07:00

gitworkflows.txt

…

glossary-content.txt

…

howto-index.sh

…

i18n.txt

…

install-doc-quick.sh

…

install-webdoc.sh

…

mailmap.txt

…

Makefile

gitweb: Add gitweb(1) manpage for gitweb itself

2011-10-16 11:09:34 -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

Teach merge the '[-e|--edit]' option

2011-10-12 13:17:18 -07:00

merge-strategies.txt

…

pretty-formats.txt

…

pretty-options.txt

…

pull-fetch-param.txt

…

rev-list-options.txt

Merge branch 'jn/doc-dashdash' into maint

2011-09-11 21:52:18 -07:00

revisions.txt

…

sequencer.txt

…

SubmittingPatches

SubmittingPathces: remove Cogito reference

2011-09-11 20:53:00 -07:00

urls-remotes.txt

…

urls.txt

…

user-manual.conf

…

user-manual.txt

…