git, branch v1.8.1-rc1

Git 1.8.1-rc1

2012-12-07T23:17:21Z

Signed-off-by: Junio C Hamano

Documentation/diff-config: work around AsciiDoc misfortune

2012-12-07T23:15:59Z

The line that happens to begin with indent followed by "3. " was interpreted as if it was an enumerated list; just wrap the lines differently to work it around for now. Signed-off-by: Junio C Hamano

Merge branch 'maint'

2012-12-07T22:16:52Z

* maint: Update draft release notes to 1.8.0.2

Update draft release notes to 1.8.0.2

2012-12-07T22:16:38Z

Signed-off-by: Junio C Hamano

Merge branch 'jc/doc-push-satellite' into maint

2012-12-07T22:11:21Z

* jc/doc-push-satellite: Documentation/git-push.txt: clarify the "push from satellite" workflow

Merge branch 'jc/same-encoding' into maint

2012-12-07T22:10:56Z

Various codepaths checked if two encoding names are the same using ad-hoc code and some of them ended up asking iconv() to convert between "utf8" and "UTF-8". The former is not a valid way to spell the encoding name, but often people use it by mistake, and we equated them in some but not all codepaths. Introduce a new helper function to make these codepaths consistent. * jc/same-encoding: reencode_string(): introduce and use same_encoding()

Merge branch 'lt/diff-stat-show-0-lines' into maint

2012-12-07T22:10:17Z

"git diff --stat" miscounted the total number of changed lines when binary files were involved and hidden beyond --stat-count. It also miscounted the total number of changed files when there were unmerged paths. * lt/diff-stat-show-0-lines: t4049: refocus tests diff --shortstat: do not count "unmerged" entries diff --stat: do not count "unmerged" entries diff --stat: move the "total count" logic to the last loop diff --stat: use "file" temporary variable to refer to data->files[i] diff --stat: status of unmodified pair in diff-q is not zero test: add failing tests for "diff --stat" to t4049 Fix "git diff --stat" for interesting - but empty - file changes

Merge branch 'master' of git://github.com/git-l10n/git-po

2012-12-07T18:32:22Z

* 'master' of git://github.com/git-l10n/git-po: l10n: de.po: translate 22 new messages l10n: de.po: translate 825 new messages l10n: Update Swedish translation (1979t0f0u) l10n: vi.po: update to git-v1.8.0.1-347-gf94c3 l10n: Update git.pot (5 new, 1 removed messages)

Merge branch 'rr/t4041-cleanup'

2012-12-07T18:31:19Z

* rr/t4041-cleanup: t4041 (diff-submodule-option): modernize style t4041 (diff-submodule-option): rewrite add_file() routine t4041 (diff-submodule-option): parse digests sensibly t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputs

Merge branch git://github.com/ralfth/git-po-de

2012-12-07T09:30:02Z

* 'rt/de-l10n-updates-for-1.8.1' of git://github.com/ralfth/git-po-de: l10n: de.po: translate 22 new messages l10n: de.po: translate 825 new messages Signed-off-by: Jiang Xin