git, branch v1.7.2-rc1

Git 1.7.2-rc1

2010-06-30T22:49:18Z

Signed-off-by: Junio C Hamano

git.spec.in: Add gitweb subpackage

2010-06-30T22:49:18Z

Signed-off-by: Junio C Hamano

Merge branch 'ar/decorate-color'

2010-06-30T18:55:40Z

* ar/decorate-color: Add test for correct coloring of git log --decoration Allow customizable commit decorations colors log --decorate: Colorize commit decorations log-tree.c: Use struct name_decoration's type for classifying decoration commit.h: add 'type' to struct name_decoration

Merge branch 'mg/doc-rev-parse-treepath-syntax'

2010-06-30T18:55:40Z

* mg/doc-rev-parse-treepath-syntax: git-rev-parse.txt: Add more examples for caret and colon git-rev-parse.txt: Document ":path" specifier

Merge branch 'cc/cherry-pick-stdin'

2010-06-30T18:55:39Z

* cc/cherry-pick-stdin: revert: do not rebuild argv on heap revert: accept arbitrary rev-list options t3508 (cherry-pick): futureproof against unmerged files

Merge branch 'jl/status-ignore-submodules'

2010-06-30T18:55:39Z

* jl/status-ignore-submodules: Add the option "--ignore-submodules" to "git status" git submodule: ignore dirty submodules for summary and status Conflicts: builtin/commit.c t/t7508-status.sh wt-status.c wt-status.h

Merge branch 'jk/url-decode'

2010-06-30T18:55:38Z

* jk/url-decode: url_decode: URL scheme ends with a colon and does not require a slash

Merge branch 'jn/grep-open'

2010-06-30T18:55:38Z

* jn/grep-open: t/t7811-grep-open.sh: remove broken/redundant creation of fake "less" script t/t7811-grep-open.sh: ensure fake "less" is made executable t/lib-pager.sh: remove unnecessary '^' from 'expr' regular expression grep -O: allow optional argument specifying the pager (or editor) grep: Add the option '--open-files-in-pager' Unify code paths of threaded greps grep: refactor grep_objects loop into its own function Conflicts: t/t7006-pager.sh

Merge branch 'jp/string-list-api-cleanup'

2010-06-30T18:55:38Z

* jp/string-list-api-cleanup: string_list: Fix argument order for string_list_append string_list: Fix argument order for string_list_lookup string_list: Fix argument order for string_list_insert_at_index string_list: Fix argument order for string_list_insert string_list: Fix argument order for for_each_string_list string_list: Fix argument order for print_string_list

Merge branch 'tr/rev-list-count'

2010-06-30T18:55:38Z

* tr/rev-list-count: bash completion: Support "divergence from upstream" messages in __git_ps1 rev-list: introduce --count option Conflicts: contrib/completion/git-completion.bash