git, branch v1.7.9-rc0

Git 1.7.9-rc0

2012-01-06T20:51:09Z

Signed-off-by: Junio C Hamano

Merge branch 'jc/show-sig'

2012-01-06T20:44:07Z

* jc/show-sig: log --show-signature: reword the common two-head merge case log-tree: show mergetag in log --show-signature output log-tree.c: small refactor in show_signature() commit --amend -S: strip existing gpgsig headers verify_signed_buffer: fix stale comment gpg-interface: allow use of a custom GPG binary pretty: %G[?GS] placeholders test "commit -S" and "log --show-signature" log: --show-signature commit: teach --gpg-sign option Conflicts: builtin/commit-tree.c builtin/commit.c builtin/merge.c notes-cache.c pretty.c

Merge branch 'jm/stash-diff-disambiguate'

2012-01-06T20:44:03Z

* jm/stash-diff-disambiguate: stash: Don't fail if work dir contains file named 'HEAD'

Merge branch 'jh/fetch-head-update'

2012-01-06T20:44:01Z

* jh/fetch-head-update: write first for-merge ref to FETCH_HEAD first

Merge branch 'pw/p4-view-updates'

2012-01-06T20:43:59Z

* pw/p4-view-updates: git-p4: view spec documentation git-p4: rewrite view handling git-p4: support single file p4 client view maps git-p4: sort client views by reverse View number git-p4: fix test for unsupported P4 Client Views git-p4: test client view handling

Sync with 1.7.8.3

2012-01-06T20:42:48Z

Git 1.7.8.3

2012-01-06T20:41:39Z

Signed-off-by: Junio C Hamano

Merge branch 'jn/maint-gitweb-utf8-fix' into maint

2012-01-06T20:36:43Z

* jn/maint-gitweb-utf8-fix: gitweb: Fix fallback mode of to_utf8 subroutine gitweb: Output valid utf8 in git_blame_common('data') gitweb: esc_html() site name for title in OPML gitweb: Call to_utf8() on input string in chop_and_escape_str()

Merge branch 'maint-1.7.7' into maint

2012-01-06T20:35:12Z

* maint-1.7.7: Documentation: rerere.enabled is the primary way to configure rerere

Merge branch 'maint-1.7.6' into maint-1.7.7

2012-01-06T20:35:05Z

* maint-1.7.6: Documentation: rerere.enabled is the primary way to configure rerere