git, branch v1.7.11

Git 1.7.11

2012-06-17T21:07:15Z

Signed-off-by: Junio C Hamano

Sync with 1.7.10.5

2012-06-17T21:05:53Z

Git 1.7.10.5

2012-06-17T21:04:15Z

Signed-off-by: Junio C Hamano

Do not autosquash in case of an implied interactive rebase

2012-06-17T21:01:42Z

The option to autosquash is only used in case of an interactive rebase. When merges are preserved, rebase uses an interactive rebase internally, but in this case autosquash should still be disabled. Signed-off-by: Vincent van Ravesteijn Signed-off-by: Junio C Hamano

Merge branch 'js/maint-fast-export-mark-error' into maint

2012-06-17T21:00:03Z

"git fast-export" did not give a readable error message when the same mark erroneously appeared twice in the --import-marks input.

Merge git://github.com/git-l10n/git-po

2012-06-15T22:01:16Z

Updated Italian translations. * git://github.com/git-l10n/git-po: l10n: it.po: translate 212 new messages

Merge branch 'as/diff-shortstat-ignore-binary'

2012-06-15T22:00:53Z

# By Alexander Strasser * as/diff-shortstat-ignore-binary: diff: Only count lines in show_shortstats

diff: Only count lines in show_shortstats

2012-06-15T22:00:04Z

Do not mix byte and line counts. Binary files have byte counts; skip them when accumulating line insertions/deletions. The regression was introduced in e18872b. Signed-off-by: Alexander Strasser Signed-off-by: Junio C Hamano

perl/Makefile: install Git::SVN::* when NO_PERL_MAKEMAKER=yes, too

2012-06-15T20:24:06Z

v1.7.11-rc1~12^2~2 (2012-05-27) and friends split some git-svn code into separate modules but did not update the fallback rules to install them when NO_PERL_MAKEMAKER is set. Add the appropriate rules so users without MakeMaker can use git-svn again. Affected modules: Git::SVN::Prompt, Git::SVN::Fetcher, Git::SVN::Editor, Git::SVN::Ra, Git::SVN::Memoize::YAML. Reported-by: Adam Roben Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

perl/Makefile.PL: warn about duplicate module list in perl/Makefile

2012-06-15T20:22:52Z

Adding or removing a module requires modifying both files to support builds with and without MakeMaker. Add a comment to remind patch authors and reviewers at the crucial moment. Longer term, it would be nicer to maintain a single list, perhaps in a separate file used by both build systems. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano