git, branch v1.7.1-rc2

Git 1.7.1-rc2

2010-04-19T05:19:04Z

Signed-off-by: Junio C Hamano

Merge branch 'rr/remote-helper-doc'

2010-04-19T04:32:25Z

* rr/remote-helper-doc: Documentation/remote-helpers: Fix typos and improve language Fixup: Second argument may be any arbitrary string Documentation/remote-helpers: Add invocation section Documentation/urls: Rewrite to accomodate ::

Documentation/remote-helpers: Rewrite description

Merge branch 'wp/doc-filter-direction'

2010-04-19T04:32:21Z

* wp/doc-filter-direction: documentation: clarify direction of core.autocrlf

Merge branch 'jk/maint-diffstat-overflow'

2010-04-19T04:31:50Z

* jk/maint-diffstat-overflow: diff: use large integers for diffstat calculations

Merge branch 'jg/auto-initialize-notes-with-percent-n-in-format'

2010-04-19T04:31:29Z

* jg/auto-initialize-notes-with-percent-n-in-format: t3301: add tests to use --format="%N" pretty: Initialize notes if %N is used

Merge branch 'maint'

2010-04-19T04:31:20Z

* maint: Documentation: Describe other situations where -z affects git diff

Merge git://git.kernel.org/pub/scm/gitk/gitk

2010-04-19T01:36:41Z

* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Display dirty submodules correctly gitk: Fix display of copyright symbol gitk: Add emacs editor variable block gitk: Avoid calling tk_setPalette on Windows gitk: Don't clobber "Remember this view" setting gitk: Add comments to explain encode_view_opts and decode_view_opts gitk: Use consistent font for all text input fields gitk: Set the font for all listbox widgets gitk: Set the font for all spinbox widgets gitk: Remove forced use of sans-serif font gitk: Add Ctrl-W shortcut for closing the active window

Documentation/remote-helpers: Fix typos and improve language

2010-04-18T20:56:29Z

Fix some typos and errors in grammar and tense. Signed-off-by: Ramkumar Ramachandra Acked-by: Sverre Rabbelier Signed-off-by: Junio C Hamano

Fixup: Second argument may be any arbitrary string

2010-04-18T20:56:24Z

This is intended to be a fixup for commit ad466d1 in pu. As Jonathan Neider pointed out, the second argument may be any arbitrary string, and need not conform to any URL-like shape. Signed-off-by: Ramkumar Ramachandra Acked-by: Sverre Rabbelier Signed-off-by: Junio C Hamano

Documentation/remote-helpers: Add invocation section

2010-04-18T20:56:17Z

Add an 'Invocation' section to specify what the command line arguments mean. Also include a link to git-remote in the 'See Also' section. Signed-off-by: Ramkumar Ramachandra Acked-by: Sverre Rabbelier Signed-off-by: Junio C Hamano