|
|
2.
|
|
|
Fix them up in the work tree, and then use 'git add/rm <file>' 
as appropriate to mark resolution and make a commit. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:196
|
|
|
3.
|
|
|
You have not concluded your merge (MERGE_HEAD exists).
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:209 builtin/merge.c:1379
|
|
|
18.
|
|
|
report archived files on stderr
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
archive.c:561
|
|
|
22.
|
|
|
list supported archive formats
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
archive.c:566
|
|
|
24.
|
|
|
retrieve the archive from remote repository <repo>
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
archive.c:569 builtin/archive.c:90
|
|
|
27.
|
|
|
Negative patterns are ignored in git attributes
Use '\!' for literal leading exclamation. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
attr.c:404
|
|
|
28.
|
|
|
Not setting branch %s as its own upstream.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
branch.c:67
|
|
|
29.
|
|
|
Branch %s set up to track remote branch %s from %s by rebasing.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
branch.c:84
|
|
|
30.
|
|
|
Branch %s set up to track remote branch %s from %s.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
branch.c:85
|
|
|
31.
|
|
|
Branch %s set up to track local branch %s by rebasing.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
branch.c:89
|
