git, branch v1.7.2-rc0

Git 1.7.2-rc0

2010-06-27T19:16:06Z

Signed-off-by: Junio C Hamano

Merge branch 'cp/textconv-cat-file'

2010-06-27T19:07:55Z

* cp/textconv-cat-file: git-cat-file.txt: Document --textconv t/t8007: test textconv support for cat-file textconv: support for cat_file sha1_name: add get_sha1_with_context()

Merge branch 'pb/maint-perl-errmsg-no-dir'

2010-06-27T19:07:45Z

* pb/maint-perl-errmsg-no-dir: Git.pm: better error message

Merge branch 'tr/send-email-8bit'

2010-06-27T19:07:45Z

* tr/send-email-8bit: send-email: ask about and declare 8bit mails

Merge branch 'js/maint-am-rebase-invalid-author'

2010-06-27T19:07:44Z

* js/maint-am-rebase-invalid-author: am: use get_author_ident_from_commit instead of mailinfo when rebasing

Merge branch 'ab/blame-textconv'

2010-06-27T19:07:44Z

* ab/blame-textconv: t/t8006: test textconv support for blame textconv: support for blame textconv: make the API public Conflicts: diff.h

Merge branch 'jn/show-num-walks'

2010-06-27T19:07:44Z

* jn/show-num-walks: DWIM 'git show -5' to 'git show --do-walk -5'

Merge branch 'maint'

2010-06-25T18:45:27Z

* maint: msvc: Fix some compiler warnings Documentation: grep: fix asciidoc problem with -- msvc: Fix some "expr evaluates to function" compiler warnings

msvc: Fix some compiler warnings

2010-06-25T18:04:16Z

In particular, using the normal (or production) compiler warning level (-W3), msvc complains as follows: .../sha1.c(244) : warning C4018: '<' : signed/unsigned mismatch .../sha1.c(270) : warning C4244: 'function' : conversion from \ 'unsigned __int64' to 'unsigned long', possible loss of data .../sha1.c(271) : warning C4244: 'function' : conversion from \ 'unsigned __int64' to 'unsigned long', possible loss of data Note that gcc issues a similar complaint about line 244 when compiling with -Wextra. Signed-off-by: Ramsay Jones Signed-off-by: Junio C Hamano

Documentation: grep: fix asciidoc problem with --

2010-06-25T15:57:17Z

Asciidoc interprets two dashes separated by spaces as a single big dash. So let's escape the first dash, so that "\--" will properly appear as "--". Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano