git, branch v1.7.10.1

Git 1.7.10.1

2012-05-02T04:18:44Z

Signed-off-by: Junio C Hamano

Merge branch 'pw/fast-import-dataref-parsing' into maint

2012-05-02T04:12:46Z

The parser in "fast-import" did not diagnose ":9" style references that is not followed by required SP/LF as an error. By Pete Wyckoff * pw/fast-import-dataref-parsing: fast-import: tighten parsing of datarefs

Merge branch 'it/fetch-pack-many-refs' into maint

2012-05-02T04:12:36Z

When "git fetch" encounters repositories with too many references, the command line of "fetch-pack" that is run by a helper e.g. remote-curl, may fail to hold all of them. Now such an internal invocation can feed the references through the standard input of "fetch-pack". By Ivan Todoroski * it/fetch-pack-many-refs: remote-curl: main test case for the OS command line overflow fetch-pack: test cases for the new --stdin option remote-curl: send the refs to fetch-pack on stdin fetch-pack: new --stdin option to read refs from stdin Conflicts: t/t5500-fetch-pack.sh

Merge branch 'jl/maint-submodule-recurse-fetch' into maint

2012-05-02T04:12:25Z

"git fetch" that recurses into submodules on demand did not check if it needs to go into submodules when non branches (most notably, tags) are fetched. By Jens Lehmann * jl/maint-submodule-recurse-fetch: submodules: recursive fetch also checks new tags for submodule commits

Merge branch 'jc/maint-blame-minimal' into maint

2012-05-02T04:11:49Z

"git blame" started missing quite a few changes from the origin since we stopped using the diff minimalization by default in v1.7.2 era. Teach "--minimal" option to "git blame" to work around this regression. * jc/maint-blame-minimal: blame: accept --need-minimal

Merge branch 'lp/maint-diff-three-dash-with-graph' into maint

2012-05-02T04:11:40Z

"log -p --graph" used with "--stat" had a few formatting error. By Lucian Poston * lp/maint-diff-three-dash-with-graph: t4202: add test for "log --graph --stat -p" separator lines log --graph: fix break in graph lines log --graph --stat: three-dash separator should come after graph lines

Merge branch 'jk/rebase-i-submodule-conflict-only' into maint

2012-05-02T04:11:26Z

Giving "--continue" to a conflicted "rebase -i" session skipped a commit that only results in changes to submodules. By John Keeping * jk/rebase-i-submodule-conflict-only: rebase -i continue: don't skip commits that only change submodules

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

2012-05-02T04:09:46Z

By Byrial Jensen (2) and others via Jiang Xin (1) and Ralf Thielow (1) * 'maint' of https://github.com/git-l10n/git-po: l10n: Initial German translation l10n: Update Simplified Chinese translation l10n: Update git.pot (2 new messages) l10n: Add the German translation team and initialize de.po l10n: Add Danish team (da) to list of teams l10n: New da.po file with 0 translations l10n: Updated pt_PT language

l10n: Initial German translation

2012-05-01T14:28:58Z

Helped-by: Thomas Kuchs Signed-off-by: Ralf Thielow

l10n: Update Simplified Chinese translation

2012-04-28T14:53:41Z

Translate 2 new messages come from git maint branch. Signed-off-by: Jiang Xin