Junio C Hamano 5b1fd7ba15 Merge branch 'master' into next ...

* master: (32 commits)
  t/t3415: use && where applicable.
  SubmittingPatches: Document some extra tags used in commit messages
  diffcore-pickaxe.c: a void function shouldn't try to return something
  Make test script t9157 executable
  Martin Langhoff has a new e-mail address
  Documentation/git-clone: describe --mirror more verbosely
  do not depend on signed integer overflow
  work around buggy S_ISxxx(m) implementations
  xdiff: cast arguments for ctype functions to unsigned char
  init: plug tiny one-time memory leak
  diffcore-pickaxe.c: remove unnecessary curly braces
  t3020 (ls-files-error-unmatch): remove stray '1' from end of file
  setup: make sure git dir path is in a permanent buffer
  environment.c: remove unused variable
  Add MinGW-specific execv() override.
  Fix Windows-specific macro redefinition warning.
  Fix 'clone' failure at DOS root directory.
  mingw: do not crash on open(NULL, ...)
  git-am: fix detection of absolute paths for windows
  Side-step MSYS-specific path "corruption" leading to t5560 failure.
  ...

2010-10-06 13:50:20 -07:00

..

howto

Merge branch 'jn/cherry-revert-message-clean-up'

2010-08-31 16:25:11 -07:00

pt_BR

Documentation: update pt-BR

2009-10-01 08:21:35 -04:00

RelNotes

Start 1.7.4 cycle

2010-09-29 15:26:17 -07:00

technical

Merge branch 'jf/merge-ignore-ws' into next

2010-09-22 09:35:59 -07:00

.gitattributes

Define the project whitespace policy

2008-02-11 13:23:15 -08:00

.gitignore

Documentation: Avoid use of xmlto --stringparam

2009-12-05 10:03:49 -08:00

asciidoc.conf

Merge branch 'jc/maint-doc-em-dash'

2010-09-03 09:43:42 -07:00

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

Fix the building of gitman.info document

2008-12-29 00:40:10 -08:00

cmd-list.perl

Documentation: rename gitlink macro to linkgit

2008-01-06 18:41:44 -08:00

CodingGuidelines

CodingGuidelines: spell Arithmetic Expansion with $(($var))

2010-09-27 10:45:29 -07:00

config.txt

Merge branch 'jk/repack-reuse-object'

2010-10-06 12:11:26 -07:00

date-formats.txt

Document date formats accepted by parse_date()

2009-12-03 12:41:37 -08:00

diff-format.txt

Fix typos in technical documentation.

2010-01-31 10:24:53 -08:00

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 'kb/merge-recursive-rename-threshold' into next

2010-09-30 15:00:03 -07:00

docbook-xsl.css

docbook: change css style

2009-04-06 00:27:09 -07:00

docbook.xsl

Documentation: set a !DOCTYPE for user manual

2010-08-20 10:53:56 -07:00

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

Merge branch 'jc/maint-doc-em-dash'

2010-09-03 09:43:42 -07:00

git-am.txt

Merge branch 'sh/am-keep-cr'

2010-03-10 15:32:34 -08:00

git-annotate.txt

Documentation: minor grammatical fixes.

2009-03-02 12:34:54 -08:00

git-apply.txt

Documentation: cite git-am from git-apply

2010-08-09 09:15:41 -07:00

git-archimport.txt

Martin Langhoff has a new e-mail address

2010-10-06 12:08:48 -07:00

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: remove stray backslashes from "Fighting regressions" article

2010-08-20 14:16:51 -07:00

git-bisect.txt

Documentation: add "Fighting regressions with git bisect" article

2009-11-08 18:29:08 -08:00

git-blame.txt

Merge remote branch 'remotes/trast-doc/for-next'

2010-01-20 20:28:49 -08:00

git-branch.txt

Merge branch 'maint'

2010-04-17 12:40:45 -07:00

git-bundle.txt

git-bundle.txt: Clarify rev-list-args restrictions

2010-08-23 09:05:32 -07:00

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

Documentation: minor grammatical fixes in git-check-attr.txt

2009-03-22 21:02:38 -07:00

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

Documentation: remove backslashes in manpage synopses

2010-08-20 14:16:22 -07:00

git-checkout.txt

Fix missing 'does' in man-page for 'git checkout'

2010-09-27 15:08:06 -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

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-citool.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-clean.txt

Add -e/--exclude to git-clean.

2010-07-20 16:52:53 -07:00

git-clone.txt

Documentation/git-clone: describe --mirror more verbosely

2010-10-06 11:24:17 -07:00

git-commit-tree.txt

Documentation: remove backslashes in manpage synopses

2010-08-20 14:16:22 -07:00

git-commit.txt

Documentation: spelling fixes

2010-07-20 16:59:17 -07:00

git-config.txt

Merge remote branch 'remotes/trast-doc/for-next'

2010-01-20 20:28:49 -08:00

git-count-objects.txt

count-objects: Add total pack size to verbose output

2008-08-17 01:01:42 -07:00

git-cvsexportcommit.txt

Martin Langhoff has a new e-mail address

2010-10-06 12:08:48 -07:00

git-cvsimport.txt

Documentation: spelling fixes

2010-07-20 16:59:17 -07:00

git-cvsserver.txt

Martin Langhoff has a new e-mail address

2010-10-06 12:08:48 -07:00

git-daemon.txt

daemon: allow more than one host address given via --listen

2010-09-28 11:05:35 -07:00

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

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-diff-index.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-diff-tree.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-diff.txt

Documentation: link to gitrevisions rather than git-rev-parse

2010-07-05 13:39:13 -07:00

git-difftool.txt

Merge remote branch 'remotes/trast-doc/for-next'

2010-01-20 20:28:49 -08:00

git-fast-export.txt

Merge branch 'jn/doc-backslash'

2010-09-03 09:43:42 -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

Documentation: Refer to git-commit-tree in git-filter-branch help

2010-09-27 11:39:44 -07:00

git-fmt-merge-msg.txt

merge: Make 'merge.log' an integer or boolean option

2010-09-09 11:39:23 -07:00

git-for-each-ref.txt

Documentation: remove backslashes in manpage synopses

2010-08-20 14:16:22 -07:00

git-format-patch.txt

Merge branch 'rr/format-patch-count-without-merges'

2010-09-29 13:49:09 -07:00

git-fsck-objects.txt

Documentation: be consistent about "git-" versus "git "

2008-07-01 17:20:15 -07:00

git-fsck.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-gc.txt

Merge branch 'maint'

2010-07-05 11:56:53 -07:00

git-get-tar-commit-id.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-grep.txt

Documentation: add missing quotes to "git grep" examples

2010-08-20 14:16:21 -07:00

git-gui.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-hash-object.txt

Documentation: spelling fixes

2010-07-20 16:59:17 -07:00

git-help.txt

Work around em-dash handling in newer AsciiDoc

2010-08-24 09:48:20 -07:00

git-http-backend.txt

Documentation: Clarify support for smart HTTP backend

2010-03-30 16:49:19 -07:00

git-http-fetch.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-http-push.txt

Use 'fast-forward' all over the place

2009-10-24 23:50:28 -07:00

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

init-db: migrate to parse-options

2009-07-12 14:36:40 -07:00

git-init.txt

Add a "TEMPLATE DIRECTORY" section to git-init[1].

2010-02-17 12:17:53 -08:00

git-instaweb.txt

Merge branch 'jc/maint-doc-em-dash'

2010-09-03 09:43:42 -07:00

git-log.txt

Documentation/git-log: Clarify --full-diff

2010-08-09 11:53:32 -07:00

git-lost-found.txt

Documentation: be consistent about "git-" versus "git "

2008-07-01 17:20:15 -07:00

git-ls-files.txt

Merge branch 'js/ls-files-x-doc'

2010-09-18 14:46:44 -07:00

git-ls-remote.txt

Update my e-mail address

2008-08-01 23:21:44 -07:00

git-ls-tree.txt

Documentation: format full commands in typewriter font

2010-01-10 13:01:25 +01:00

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

merge-base --independent to print reduced parent list in a merge

2010-08-18 14:02:03 -07:00

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

Documentation: remove backslashes in manpage synopses

2010-08-20 14:16:22 -07:00

git-merge-one-file.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-merge-tree.txt

Improve language in git-merge.txt and related docs

2008-12-09 20:57:52 -08:00

git-merge.txt

merge: --log appends shortlog to message if specified

2010-05-10 12:02:20 -07:00

git-mergetool--lib.txt

Work around em-dash handling in newer AsciiDoc

2010-08-24 09:48:20 -07:00

git-mergetool.txt

Documentation: Explain git-mergetool's use of temporary files

2010-07-19 09:16:09 -07:00

git-mktag.txt

Documentation: be consistent about "git-" versus "git "

2008-07-01 17:20:15 -07:00

git-mktree.txt

mktree --batch: build more than one tree object

2009-05-16 10:28:59 -07:00

git-mv.txt

UI consistency: allow --force for where -f means force

2009-08-29 14:08:03 -07:00

git-name-rev.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

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

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-pack-refs.txt

doc/git-pack-refs: fix two grammar issues

2009-04-05 00:39:37 -07:00

git-parse-remote.txt

parse-remote: remove unused functions

2009-06-11 19:50:45 -07:00

git-patch-id.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-peek-remote.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-prune-packed.txt

prune-packed: migrate to parse-options

2009-07-10 23:57:21 -07:00

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: do not convert ... operator to ellipses

2010-08-20 14:16:51 -07:00

git-quiltimport.txt

quiltimport documentation: --dry-run and -n are synonyms

2009-09-13 01:32:49 -07:00

git-read-tree.txt

read-tree: deprecate syntax without tree-ish args

2010-09-10 08:37:14 -07:00

git-rebase.txt

Merge branch 'jn/doc-backslash'

2010-09-03 09:43:42 -07:00

git-receive-pack.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-reflog.txt

Documentation: link to gitrevisions rather than git-rev-parse

2010-07-05 13:39:13 -07:00

git-relink.txt

Documentation: remove backslashes in manpage synopses

2010-08-20 14:16:22 -07:00

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

repack: add -F flag to let user choose between --no-reuse-delta/object

2010-09-27 12:39:05 -07:00

git-replace.txt

Documentation: format full commands in typewriter font

2010-01-10 13:01:25 +01:00

git-repo-config.txt

Documentation: be consistent about "git-" versus "git "

2008-07-01 17:20:15 -07:00

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

git-reset.txt: make modes description more consistent

2010-09-18 15:14:41 -07:00

git-rev-list.txt

Merge branch 'il/rev-glob'

2010-02-23 12:05:18 -08:00

git-rev-parse.txt

Documentation: remove stray backslashes in rev-parse manual

2010-08-20 14:16:22 -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

Documentation: clarify quoting in "git rm" example

2010-08-20 14:16:21 -07:00

git-send-email.txt

Merge branch 'jp/send-email-to-cmd' into next

2010-09-30 15:00:03 -07:00

git-send-pack.txt

Documentation: describe --thin more accurately

2010-02-18 17:13:18 -08:00

git-sh-setup.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-shell.txt

shell: Rewrite documentation and improve error message

2010-08-24 10:47:21 -07:00

git-shortlog.txt

shortlog: Document and test --format option

2010-05-04 15:30:59 -07:00

git-show-branch.txt

Documentation: remove stray backslash in show-branch discussion

2010-08-20 14:19:46 -07:00

git-show-index.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-show-ref.txt

Documentation: unbreak regex in show-ref manual

2010-08-20 14:16:21 -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

Add a built-in alias for 'stage' to the 'add' command

2008-12-02 16:13:16 -08:00

git-stash.txt

detached-stash: update Documentation

2010-08-21 23:51:22 -07: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

Documentation: be consistent about "git-" versus "git "

2008-07-01 17:20:15 -07:00

git-submodule.txt

git submodule add: Remove old docs about implicit -f

2010-07-19 11:11:07 -07:00

git-svn.txt

Documentation/git-svn: discourage "noMetadata"

2010-09-24 08:21:54 +00:00

git-symbolic-ref.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-tag.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-tar-tree.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-tools.txt

Remove outdated references to cogito in documentation

2007-10-29 12:53:50 -07:00

git-unpack-file.txt

Documentation: be consistent about "git-" versus "git "

2008-07-01 17:20:15 -07:00

git-unpack-objects.txt

Documentation formatting and cleanup

2008-07-01 17:20:16 -07:00

git-update-index.txt

Documentation: remove backslashes in manpage synopses

2010-08-20 14:16:22 -07:00

git-update-ref.txt

Documentation: be consistent about "git-" versus "git "

2008-07-01 17:20:15 -07:00

git-update-server-info.txt

Remove obsolete bug warning in man git-update-server-info

2009-04-25 09:29:38 -07:00

git-upload-archive.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-upload-pack.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-var.txt

Fix 'git var' usage synopsis

2010-02-14 18:23:16 -08:00

git-verify-pack.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-verify-tag.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-web--browse.txt

Work around em-dash handling in newer AsciiDoc

2010-08-24 09:48:20 -07:00

git-whatchanged.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-write-tree.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git.txt

Git 1.7.3.1

2010-09-29 10:39:53 -07:00

gitattributes.txt

Merge branch 'bc/fortran-userdiff'

2010-09-29 13:49:23 -07:00

gitcli.txt

Update "describe" documentation to match reality

2009-09-22 19:40:05 -07:00

gitcore-tutorial.txt

Documentation: avoid stray backslashes in core tutorial

2010-08-20 14:16:50 -07:00

gitcvs-migration.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

gitdiffcore.txt

gitdiffcore doc: update pickaxe description

2010-08-31 14:28:20 -07:00

gitglossary.txt

Documentation: fix links to "everyday.html"

2008-11-14 21:48:10 -08:00

githooks.txt

notes: implement helpers needed for note copying during rewrite

2010-03-12 21:55:39 -08:00

gitignore.txt

Documentation: clarify quoting in gitignore docs

2010-08-20 14:16:21 -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

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

gittutorial.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

gitworkflows.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

glossary-content.txt

Use 'fast-forward' all over the place

2009-10-24 23:50:28 -07:00

howto-index.sh

…

i18n.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

install-doc-quick.sh

install-doc-quick - use git --exec-path to find git-sh-setup

2008-07-08 16:36:03 -07:00

install-webdoc.sh

install-webdoc: keep installed RelNotes-*.txt

2010-09-09 16:17:59 -07:00

mailmap.txt

Documentation: minor grammatical fixes in git-blame.txt.

2009-03-17 12:08:43 -07:00

Makefile

docs: fix Makefile dependency for user manual

2010-08-21 21:53:16 -07:00

manpage-1.72.xsl

Documentation: move quieting params into manpage-base.xsl

2009-03-27 00:33:19 -07:00

manpage-base-url.xsl.in

Documentation: Avoid use of xmlto --stringparam

2009-12-05 10:03:49 -08:00

manpage-base.xsl

Documentation: use "spurious .sp" XSLT if DOCBOOK_SUPPRESS_SP is set

2009-04-01 11:02:42 -07:00

manpage-bold-literal.xsl

Documentation: option to render literal text as bold for manpages

2009-03-27 00:33:20 -07:00

manpage-normal.xsl

Documentation: move "spurious .sp" code into manpage-base.xsl

2009-03-27 00:33:19 -07:00

manpage-quote-apos.xsl

Quote ' as \(aq in manpages

2009-10-22 12:59:50 -07:00

manpage-suppress-sp.xsl

Documentation: use "spurious .sp" XSLT if DOCBOOK_SUPPRESS_SP is set

2009-04-01 11:02:42 -07:00

merge-config.txt

Merge branch 'rr/fmt-merge-msg'

2010-09-29 13:48:20 -07:00

merge-options.txt

merge: Make '--log' an integer option for number of shortlog entries

2010-09-09 11:39:20 -07:00

merge-strategies.txt

merge-recursive: option to specify rename threshold

2010-09-29 13:15:56 -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

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

rev-list-options.txt

rev-list-options: clarify --parents and --children

2010-09-30 09:38:47 -07:00

revisions.txt

update comment and documentation for :/foo syntax

2010-09-27 10:54:52 -07:00

SubmittingPatches

SubmittingPatches: Document some extra tags used in commit messages

2010-10-06 13:45:42 -07:00

urls-remotes.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

urls.txt

Documentation: spelling fixes

2010-07-20 16:59:17 -07:00

user-manual.conf

Documentation: rename gitlink macro to linkgit

2008-01-06 18:41:44 -08:00

user-manual.txt

user-manual: fix anchor name Finding-comments-With-given-Content

2010-09-29 13:21:49 -07:00