delta/git.git, branch mm/mediawiki-dumb-push-fix

git-remote-mediawiki: no need to update private ref in non-dumb push

2013-09-03T18:58:17+00:00

We used to update the private ref ourselves, but this update is now
done by default since 664059fb (transport-helper: update remote
helper namespace, 2013-04-17).

Signed-off-by: Matthieu Moy 
Signed-off-by: Junio C Hamano

git-remote-mediawiki: use no-private-update capability on dumb push

2013-09-03T18:58:12+00:00

Signed-off-by: Matthieu Moy 
Signed-off-by: Junio C Hamano

transport-helper: add no-private-update capability

2013-09-03T18:57:53+00:00

Since 664059fb (transport-helper: update remote helper namespace,
2013-04-17), a 'push' operation on a remote helper updates the
private ref by default. This is often a good thing, but it can also
be desirable to disable this update to force the next 'pull' to
re-import the pushed revisions.

Allow remote-helpers to disable the automatic update by introducing a new
capability.

Signed-off-by: Matthieu Moy 
Signed-off-by: Junio C Hamano

git-remote-mediawiki: add test and check Makefile targets

2013-08-29T19:07:24+00:00

There are a few level 4 and 2 perlcritic issues in the current code. We
make level 5 fatal, and keep level 2 as warnings.

Signed-off-by: Matthieu Moy 
Signed-off-by: Junio C Hamano

git-remote-mediawiki: ignore generated git-mw

2013-08-13T16:52:22+00:00

Signed-off-by: Matthieu Moy 
Signed-off-by: Junio C Hamano

Merge branch 'maint'

2013-08-09T22:49:55+00:00

* maint:
  parse-options: fix clang opterror() -Wunused-value warning

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

2013-08-09T21:31:28+00:00

* 'master' of git://github.com/git-l10n/git-po:
  l10n: de.po: translate 5 messages
  l10n: de.po: translate 99 new messages
  l10n: de.po: switch from pure German to German+English
  l10n: de.po: Fix a typo
  l10n: Update Swedish translation (2135t0f0u)
  l10n: zh_CN.po: translate 5 messages (2135t0f0u)
  l10n: vi.po(2135t): v1.8.4 round 2
  l10n: git.pot: v1.8.4 round 2 (5 new, 3 removed)

Merge branch 'jk/submodule-subdirectory-ok'

2013-08-09T21:30:41+00:00

* jk/submodule-subdirectory-ok:
  t/t7407: fix two typos in submodule tests

Merge branch 'sb/mailmap-updates'

2013-08-09T21:30:13+00:00

* sb/mailmap-updates:
  .mailmap: fixup entries

.mailmap: fixup entries

2013-08-09T21:20:38+00:00

This patch adds no new names, but fixes the mistakes I made in the previous
commits. (94b410bba8, f4f49e225, c07a6bc57, 2013-07-12, .mailmap: Map
email addresses to names).

These mistakes are double white spaces between name and surname,
different capitalization in email address, or just the email address set
as name.

Also I forgot to include James Knight to the mailmap file.

Signed-off-by: Stefan Beller 
Signed-off-by: Junio C Hamano