git/Documentation, branch v1.7.2

Git 1.7.2

2010-07-21T19:55:50Z

Signed-off-by: Junio C Hamano

Merge branch 'maint'

2010-07-19T18:21:08Z

* maint: update-server-info: Shorten read_pack_info_file() Documentation: Explain git-mergetool's use of temporary files

git add: Add --ignore-missing to SYNOPSIS

2010-07-19T18:11:46Z

All the git add options were listed in the synopsis until the --ignore-missing option was added. Change that so that the git add documentation now has the complete listing. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

git submodule add: Remove old docs about implicit -f

2010-07-19T18:11:07Z

git submodule add no longer implicitly adds with --force. Remove references to the old functionality in the documentation. Signed-off-by: Ævar Arnfjörð Bjarmason Acked-by: Jens Lehmann Signed-off-by: Junio C Hamano

git submodule add: Require the new --force option to add ignored paths

2010-07-19T18:10:43Z

To make the behavior of "git submodule add" more consistent with "git add" ignored submodule paths should not be silently added when they match an entry in a .gitignore file. To be able to override that default behavior in the same way as we can do that for "git add", the new option "--force" is introduced. Signed-off-by: Jens Lehmann Acked-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

Merge branch 'jl/add-n-ignore-missing'

2010-07-19T18:09:38Z

* jl/add-n-ignore-missing: git add: Add the "--ignore-missing" option for the dry run

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

2010-07-19T16:16:09Z

'git mergetool' creates '*.orig' backup files in its default configuration. Mention this in its documentation. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

Merge branch 'eb/doc-log-manpage'

2010-07-15T19:07:56Z

* eb/doc-log-manpage: Reorganize `git-log' man page to clarify common diff options.

Merge branch 'mg/revision-doc'

2010-07-15T19:07:01Z

* mg/revision-doc: Documentation: link to gitrevisions rather than git-rev-parse Documentation: gitrevisions Documentation: split off rev doc into include file

Merge branch 'ab/submodule-add-f'

2010-07-15T19:06:25Z

* ab/submodule-add-f: git submodule: add submodules with git add -f