$,IaFapa/AbvqbpbLYccccc dd'dCd`d sdE}d)d4dE"e&he2e6ee?f.Xf<f@f?g7Eg*}g=gKg82h&kh=hHh.i+Hi.ti-i4ijGj^jUpjRj+kEk'Uk#}k.k.k=k"=l`lyl/lllll'm8m(Rm!{mmmmmmmn*nFn)Nnxn2n$n%n/n"/o!Ro"to?ooo p*pGpfpppp\p#qCq&Uq |q qq,qq r,rGr$drrrr"rr' s3s!Ksmsssssss-t 2t"St vt5t&t]t(Ru{u\uTu[MvvvvvwT$w#ywVwwx x,:x(gx xx xx xxx*x y4y"My$py yy<y!y#z!>z%`z0z7zz {'){ Q{$r{*{,{8{,(|8U|+||)|)}.}&K}$r}(}Z}E~a~!~3~0~)28R0.+7/O$#F!E"g!ʁ-/G fp/.Ƃ34Jhȃ5݃BB +Lfy!%ԅ!03Dx.#GY(S:ևVBh1݈!:'PxZ-36[j9Ɗ.<$k .ɋ#+Hb"s$ ތ,,#Ko&%ۍ3HL .ˎ1',5T%!Ə0-)(W4ҐMi'ΑL$B)g&#͒!% Ef!ӓ!6Oh$,,Ք!>Xk~˕/'M'u>;98*r#ޗO1I'{,И1 =Qg}!șD%"j&Ț "?1_$0қ'<+4h&&Ĝ0*9&d> ʝ<ם6)`9u7;2s <. @axV{emˡܡ!:\3u2/ܣ 4-b%ݤ/50eA%إV5 $i8ۧ3Ѩ"(A&R%y)ɩ3!1zS(Ϊ=E[p"=&9>Y ܬ)>Y1v'ЭbD" 42?Er)*@,3m4)ְ+",,O| P"q6˲³F,8<V ͵5صƶն ?)8i)̷5 , 8*Ep#&ĸ=,ƹ)70h"yD:;Li$#/л879Pq.¼,/N"m':ѽ< lI{c26&Ϳ>G3{ l(A(%&&M$&M0m"(32;n#7',<<4y57(Ir, 3R0o ;':*.e+w*8{co!B dp.!3K5g71'/"*@)kG&B?t6h.N'{B)'0SL.{X6772o1KZj .29A P"]b8%/%Ou1 *; O Zh x#D#DB]" '&6]tx;"))<S#0*7(b 8Lc 2"Uiz/ 3I<eRMVh1%#<\"u,$ 4Tp$ !%G&d/5%U{"#W8!C 8Pby(0+)8 ?(Ir*lU.k$3'Ks !)Ki#-/- DR4o # 7 ?B>>&5\z4c(/EX3)] 0<%m1! $"01S! #0Tm=<=&d{ 61D_u56%Pv,!B"dD#4$Ty${ # 063j$"! '4P`*<c(b6 !;+V$':% F!_.,."Kn s.*#%8N&f%Z>. m{, 31 'e !  ;  # "4  W 8d     7   -  ; I d i z  ;  p d  7 @ < )P  z 0  % % *B_sA/CS$j5 8  D&e+%52J(d#&:&a!2$Kp (D$^*#"#?c w9   # -2L!h,E`rB[\[T"i!!7 GMR3>>*R7}; =5P;>>2@.s7C6(U9~D270 :h 4 %  G!Z!Sl!W!,"E"'Y""*"*"8"-0#^#{#9#### $."$#Q$.u$%$$$$%!%7%<%3Q%%0% %7%&&&*F&q& &!&=&'!-'!O'!q'!'''''^(p(("(( ((5)$8) ])#h))+)))!) *7* U*v****** ++1+.E+!t++&+:+#,O;,*,,_,P4-X---&.&8. _.Ki...Q.6/P/!g/)/-// / / 00&0 90.C0 r04~0'0'0 116.1e1~11*1)1= 2!I2k2 }22"202' 3243*g3A3.3"4#&4)J4 t444-4M5@O55595(5!6";6+^6)6&616< 7!J7l7!777E7&8(:8c88(88(8:8%9 A9K93e990999 :5":aX:::+:};;@;7;<9<O<"d<#<#<,<#< =:=2T==0=#=Z=}M>t>Y@??e@*@$@@@ A+AJAUeA$AA.AU.B,BB B,BC6CVC'lC C"CC C'D)D;DNDjD*DDDD!E''EOEkE$EEHE F"F'@F7hF'F1FFG/G8LGG0G/GAG#;H_HqHHJHHII6IFIBVI!I*II.I+JHJ`JpJJJJJJK(K;KQKdKzKKK)K)KL/LKLaLsLL LL!LLM M2M'QM'yMM;M>M8;N)tN%N+N"NkO9O'O.OP)P-FPtPPPPPP! Q,QUkU<}UzU05V4fV V6VVVW#W'8W`W {WYWW zX!XX XXXXXY+Y =Y#^YY>Y)Y!["[1A[s[[[%[ [ \\.\+J\6v\?\$\!]4]OM]] ]](^^:^^__0`!1`S`r`"`%`0`a3"aVa-uaca(b0b@Cbbbb&bbNc!Vc>xc-cccd!d@d$^d<dd3de ,eW:ee1Efwf f1fFf*gAg._g8g4g.g+h-Ih"wh'hhhi.i7i$j6j|kk(3l3\l/lll l5l5m mmn n06n4gnnn&n$n o &o)4o^o/yoo*ooIzp'ppp-qMq^q~qFq9qr2rHr'drr'r/r7sMv7vwwtw@&xgx"x!xxyyF}z2zz{'{%A{g{}{/{{!{5{ +|-L|9z|6|5|!}5}K}g}&w}}}}}-}$"~ G~ T~u~~$~!~~ 92@5s$#΂d9Wd`'" JX iw'͆--*:X:"·'/21%TW ʊ;cC5]݋;Z]y*׌'#,ՍKL XY d$- -;i7HY q }     “Γד' "0C#VzaqyG ݕ!'5]p3 Ö / D N [ hu }QCeSҘ' (&O_o!!3&3Z$rBښ!<*N*y-қ<Qgyœߜ"8Sf<~͝-4*b / +Z8Z 3 T[)s͠!6'Xáޡ&8Pg*&B Xyȣڣ'CUUhפ?'67n "-ȥ-$ @!K(m#Ӧvs,*ާ)C"Z} èӨ"4Pf *0* ' 8E9^ Ъ>Q0CCƫ  +Am*Yά"(6Ks6-Ѯ' ;2nů!ԯ-$"4 Wat Ұ "-;Ai3߱ $ '$4@YͲ߲$C:J'0׳":P hu|!ȴ$'9&@Eg5 ,8Un:C!>$T#y Ʒӷ1P8no*B$[/ǹ۹%#6Za ?'ͺ/(Bk$/+# 'D!l!!Ҽ!S>'= ,<O%m0'߾"*=D$ ؿ:  *4M@c   0:klr?EHQ$0 I%S!y ,M`'g   !8*>^+p +(+1K}% -@\"m' 4J_{&-@_.z! ,&/V$r3  '<[b*t'DR#^ZcT Jz -{W8i\nwfW4Q}TKb7~_MSTBER z(b{|pRy)q)ai-\l0k@INv6"OkndKQ[q=Dp0 '24c4rPR1X?Ag *U|;\Pmg= xo8<> .rfT,`=>!, BD*6HGY3;@0(J&dj7s$'#  >c|9uA_}z][RQX'sy+-ALVKuh/gYvM:&U}|ICH8[@`<8n/:6`V?1$ZO9eM" 3"eEnv6}#h<qj,*F.h_%4SIN)&CXQ  mt%fm*fo"O E3.AAGlBo>?U  Du_pj,~JG'b2p >Dsu x'_2#(V $EPt3^.ryUUWvr]=QcZxPZSN~!OF9V5?Vd/eI%imn~f+Nap<71x ){[jvWgh< y5 l/1`6FZ7cikY5;%MX"dkOwl0@aw:J&\q!;sL^aga+ H*FdtG/{l=\ KT7F  8-{CS|2H]#?4S&20 yJ.u5@(Y$^bXGt+EbK ^~]i1`9eBwj]r ;}9 tYkLM,x(mse5P+NH$B-:L[zo%!q3)!LWwCCzo:Ih # # Write a tag message # Lines starting with '#' will be ignored. # # # Write a tag message # Lines starting with '#' will be kept; you may remove them yourself if you want to. # Did you mean this? Did you mean one of these? It looks like you may be committing a cherry-pick. If this is not correct, please remove the file %s and try again. It looks like you may be committing a merge. If this is not correct, please remove the file %s and try again. To choose either option permanently, see push.default in 'git help config'. %-*s forces to %-*s (%s) %-*s forces to %s %-*s pushes to %-*s (%s) %-*s pushes to %s %s and with remote (%s has become dangling) (%s will become dangling) and with remote or: %s (Once your working directory is clean, run "git rebase --continue") (all conflicts fixed: run "git commit") (all conflicts fixed: run "git rebase --continue") (commit or discard the untracked or modified content in submodules) (fix conflicts and run "git commit") (fix conflicts and then run "git am --resolved") (fix conflicts and then run "git rebase --continue") (unable to update local ref) (use "git %s ..." to include in what will be committed) (use "git add ..." to mark resolution) (use "git add ..." to update what will be committed) (use "git add/rm ..." as appropriate to mark resolution) (use "git add/rm ..." to update what will be committed) (use "git am --abort" to restore the original branch) (use "git am --skip" to skip this patch) (use "git bisect reset" to get back to the original branch) (use "git checkout -- ..." to discard changes in working directory) (use "git commit --amend" to amend the current commit) (use "git commit" to conclude merge) (use "git rebase --abort" to check out the original branch) (use "git rebase --continue" once you are satisfied with your changes) (use "git rebase --skip" to skip this patch) (use "git reset %s ..." to unstage) (use "git rm --cached ..." to unstage) (use "git rm ..." to mark resolution) Failed to parse dirstat cut-off percentage '%.*s' Fetch URL: %s HEAD branch (remote HEAD is ambiguous, may be one of the following): HEAD branch: %s Local branch configured for 'git pull': Local branches configured for 'git pull': Local ref configured for 'git push'%s: Local refs configured for 'git push'%s: Local refs will be mirrored by 'git push' Push URL: %s Remote branch:%s Remote branches:%s Unknown dirstat parameter '%.*s' Warn: $name doesn't contain commit $sha1_dst Warn: $name doesn't contain commit $sha1_src Warn: $name doesn't contain commits $sha1_src and $sha1_dst %d file changed %d files changed %s has become dangling! %s will become dangling! (create/copy files and use "git add" to track) (left unresolved) (nothing to squash) (root-commit) (status not queried) (use "git add" and/or "git commit -a") (use "git add" to track) (use -u option to show untracked files) (use -u to show untracked files) (working directory clean) * [pruned] %s * [would prune] %s ... and %d more. 0 files changed ??? merges with remote %s new (next fetch will store in remotes/%s) shared stale (use 'git remote prune' to remove) tracked! %-*s %-*s -> %s (can't fetch in current branch)# Submodule changes to be committed:# Submodules changed but not updated:$onto_name: there are more than one merge bases$onto_name: there is no merge base$reference is not valid reference${REV}: Could not drop stash entry%d line adds whitespace errors.%d lines add whitespace errors.%lu day ago%lu days ago%lu hour ago%lu hours ago%lu minute ago%lu minutes ago%lu month ago%lu months ago%lu second ago%lu seconds ago%lu week ago%lu weeks ago%lu year%lu years%lu year ago%lu years ago%s %s is not a commit!%s (or --work-tree=) not allowed without specifying %s (or --git-dir=)%s - not something we can merge%s already exists%s did not send all necessary objects %s exists and is not a directory%s files:%s has type %o, expected %o%s is a directory in %s adding as %s instead%s is not a valid '%s' object%s is okay %s reset is not allowed in a bare repository%s%s Git repository in %s%s %s, %lu month ago%s, %lu months ago%s, source=%s, destination=%s%s: %s%s: %s cannot be used with %s%s: Unable to write new index file%s: already exists in index%s: already exists in working directory%s: cannot lock the ref%s: cannot parse parent commit %s%s: cannot update the ref%s: does not exist in index%s: does not match index%s: patch does not apply%s: wrong type%sAuthor: %s%sCommitter: %s'$arg' does not appear to be a valid revision'$args' is not a stash reference'$args' is not a stash-like commit'$invalid' is not a valid commit'$sm_path' already exists and is not a valid git repo'$sm_path' already exists in the index'%s' appears to be a git command, but we were not able to execute it. Maybe git-%s is broken?'%s' does not look like a v2 bundle file'%s' does not point to a commit'%s' has changes staged in the index (use --cached to keep the file, or -f to force removal)'%s' has local modifications (use --cached to keep the file, or -f to force removal)'%s' has staged content different from both the file and the HEAD (use -f to force removal)'%s' is beyond a symbolic link'%s' is not a commit'%s' is not a valid remote name'%s' is not a valid tag name.'%s': %s'%s': cmd for supported man viewer. Please consider using 'man..path' instead.'%s': not a regular file or symlink'%s': path for unsupported man viewer. Please consider using 'man..cmd' instead.'%s': short read %s'%s': unable to read %s'%s': unknown man viewer.'git bisect bad' can take only one argument.(To restore them type "git stash apply")(bad commit) (delete)(matching)(no URL)(no branch)(non-fast-forward)(none)(reading log message from standard input) * remote %s** warning: file %s becomes empty but is not deleted, %d deletion(-), %d deletions(-), %d insertion(+), %d insertions(+), behind --3way outside a repository--[no-]exclude-standard cannot be used for tracked contents.--add --delete doesn't make sense--all and --mirror are incompatible--all and --tags are incompatible--all can't be combined with refspecs--bare and --origin %s options are incompatible.--cached or --untracked cannot be used with --no-index.--cached outside a repository--check does not make sense--column and --verbose are incompatible--column and -n are incompatible--command must be the first argument--contains option is only allowed with -l.--delete doesn't make sense without any refs--delete is incompatible with --all, --mirror and --tags--delete only accepts plain target ref names--depth is ignored in local clones; use file:// instead.--detach cannot be used with -b/-B/--orphan--detach cannot be used with -t--dirty is incompatible with committishes--fix-thin cannot be used without --stdin--index outside a repository--long is incompatible with --abbrev=0--mirror and --tags are incompatible--mirror can't be combined with refspecs--mirror is dangerous and deprecated; please use --mirror=fetch or --mirror=push instead--mixed with paths is deprecated; use 'git reset -- ' instead.--name-only does not make sense--name-status does not make sense--no-index or --untracked cannot be used with revs.--open-files-in-pager only works on the worktree--orphan and -b|-B are mutually exclusive--orphan cannot be used with -t--ours/--theirs is incompatible with switching branches.--patch is incompatible with --{hard,mixed,soft}--patch is incompatible with all other options--points-at option is only allowed with -l.--reset-author can be used only with -C, -c or --amend.--subject-prefix and -k are mutually exclusive.--track needs a branch name--verify with no packfile name given-A and -u are mutually incompatible-B cannot be used with -b-a and -r options to 'git branch' do not make sense with a branch name-n and -k are mutually exclusive.-n option is only allowed with -l.-x and -X cannot be used together...: perhaps a D/F conflict??? what are you talking about?Aborting commit due to empty commit message. Aborting commit; you did not edit the message. Add file contents to the indexAdding %sAdding as %s insteadAdding existing repo at '$sm_path' to the indexAdding merged %sAll conflicts fixed but you are still merging.Already on '%s' Already up-to-date!Applied patch %s cleanly.Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all Applying patch %%s with %d reject...Applying patch %%s with %d rejects...Applying: $FIRSTLINEAre you sure [Y/n]? Auto packing the repository for optimum performance. Auto packing the repository for optimum performance. You may also run "git gc" manually. See "git help gc" for more information. Auto-merging %sAutomatic merge failed; fix conflicts and then commit the result. Automatic merge went well; stopped before committing as requested Available custom strategies are:Available strategies are:Bad %s value: '%s'Bad HEAD - I need a HEADBad HEAD - strange symbolic refBad bisect_write argument: $stateBad branch.%s.mergeoptions string: %sBad notes.rewriteMode value: '%s'Bad rev input: $argBad rev input: $revBranch is renamed, but update of config-file failedBranch rename failedBranch renamed to %s, but HEAD is not updated!CONFLICT (%s): Merge conflict in %sCONFLICT (%s): There is a directory with name %s in %s. Adding %s as %sCONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left in tree at %s.CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left in tree.CONFLICT (rename/add): Rename %s->%s in %s. %s added in %sCONFLICT (rename/rename): Rename "%s"->"%s" in branch "%s" rename "%s"->"%s" in "%s"%sCONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %sCan merge only exactly one commit into empty headCan not do reflog for '%s' Can't cherry-pick into empty headCan't revert as initial commitCannot %s during a %sCannot access current working directoryCannot access work tree '%s'Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite existing notesCannot apply a stash in the middle of a mergeCannot come back to cwdCannot commit uninitialized/unreferenced notes treeCannot copy notes. Found existing notes for object %s. Use '-f' to overwrite existing notesCannot delete the branch '%s' which you are currently on.Cannot determine remote HEADCannot do %s reset with paths.Cannot do a %s reset in the middle of a merge.Cannot fall back to three-way merge.Cannot get commit message for %sCannot initialize stashCannot merge multiple branches into empty headCannot open existing pack file '%s'Cannot open existing pack idx file for '%s'Cannot open patch file %sCannot overwriteCannot prepare timestamp regexp %sCannot read HEADCannot read indexCannot rebase onto multiple branchesCannot record working tree stateCannot remove temporary index (can't happen)Cannot remove worktree changesCannot save the current index stateCannot save the current statusCannot save the current worktree stateCannot switch branch to a non-commit.Cannot unstage modified filesChanges from $mb to $onto:Changes not staged for commit:Changes to be committed:Checking out '$start_head' failed. Try 'git bisect reset '.Checking patch %s...Checking rename of '%s' to '%s' Checkout a branch or paths to the working treeClever... amending the last one with dirty index.Clone a repository into a new directoryClone of '$url' into submodule path '$sm_path' failedCloning into '%s'... Cloning into bare repository '%s'... Commit %s does not have parent %dCommit %s is a merge but no -m option was given.Commit Body is:Commit your changes or stash them to proceed.Conflicts in index. Try without --index.Context reduced to (%ld/%ld) to apply fragment at %dCorrupt MERGE_HEAD file (%s)Could not append '%s'Could not append '%s' to '%s'Could not apply '%s'Could not check out original HEAD '$branch'. Try 'git bisect reset '.Could not create directory '%s'Could not create git link %sCould not create sequencer directory %sCould not delete %sCould not fetch %sCould not find a tracked remote branch, please specify manually. Could not find merge strategy '%s'. Could not find remote branch %s to clone.Could not format %s.Could not get fetch map for refspec %sCould not make %s writable by groupCould not move back to $head_nameCould not open %sCould not open '%s' for writingCould not open '%s' for writing.Could not parse commit %s Could not parse line %d.Could not parse object '%s'Could not parse object '%s'.Could not parse parent commit %s Could not read %s.Could not read from '%s'Could not read indexCould not read object %sCould not read the indexCould not remove branch %sCould not remove config section '%s'Could not rename config section '%s' to '%s'Could not reset index file to revision '%s'.Could not resolve HEAD commit Could not run 'git rev-list'Could not save index treeCould not set '%s'Could not setup %sCould not setup master '%s'Could not spawn pack-objectsCould not stat '%s'Could not write new index file.Could not write patchCould not write to %sCould not write to '%s'Couldn't find remote ref HEADCouldn't look up commit object for '%s'Couldn't look up commit object for HEADCover letter needs email formatCreate an empty git repository or reinitialize an existing oneCreate, list, delete or verify a tag object signed with GPGCurrent branch $branch_name is up to date, rebase forced.Current branch $branch_name is up to date.Deleted branch %s (was %s). Deleted remote branch %s (was %s). Deleted tag '%s' (was %s) Did you hand edit your patch? It does not apply to blobs recorded in its index.Dirty index: cannot apply patches (dirty: $files)Do you want me to do it for you [Y/n]? Does not point to a valid commit: $onto_nameDon't know how to clone %sDon't know how to fetch from %sDownload objects and refs from another repositoryDropped ${REV} ($s)Empty commit message.Empty patch. Aborted.Entering '$prefix$sm_path'Error building treesError deleting branch '%s'Error deleting remote branch '%s'Error in objectError wrapping up %sError wrapping up %s.Explicit paths specified without -i nor -o; assuming --only paths...Failed to add submodule '$sm_path'Failed to chdir: %sFailed to copy notes from '%s' to '%s'Failed to create output filesFailed to execute internal mergeFailed to find tree of %s.Failed to find tree of HEAD.Failed to merge in the changes.Failed to parse --dirstat/-X option parameter: %sFailed to parse emacsclient version.Failed to read object '%s'.Failed to recurse into submodule path '$sm_path'Failed to register submodule '$sm_path'Failed to register update mode for submodule path '$sm_path'Failed to register url for submodule path '$sm_path'Failed to resolve '%s' as a valid ref.Failed to resolve HEAD as a valid ref.Failed to start emacsclient.Falling back to patching base and 3-way merge...Fast-forwarded $branch_name to $onto_name.Fatal merge failure, shouldn't happen.Fetch from and merge with another repository or a local branchFetching %s Fetching a group and specifying refspecs does not make senseFinal output: %d %s Find by binary search the change that introduced a bugFinishing SQUASH_MSGFirst, rewinding head to replay your work on top of it...Fix them up in the work tree, and then use 'git add/rm ' as appropriate to mark resolution and make a commit, or use 'git commit -a'.Forward-port local commits to the updated upstream headFound errors in 'diff.dirstat' config variable: %sFrom %.*s Gitdir '$a' is part of the submodule path '$b' or vice versaHEAD (no branch)HEAD does not point to a branchHEAD is now atHEAD is now at %sHEAD not found below refs/heads!Huh? %.*s is in index?Hunk #%d applied cleanly.Hunk #%d succeeded at %d (offset %d line).Hunk #%d succeeded at %d (offset %d lines).If you want to keep them by creating a new branch, this may be a good time to do so with: git branch new_branch_name %s IgnoredIndex was not unstashed.Indexing objectsInitial commitInitial commit on Initialized emptyInvalid %s: '%s'Invalid branch name: '%s'Invalid cleanup mode %sInvalid key: %sInvalid old URL pattern: %sInvalid untracked files mode '%s'Invalid value for %s: %sIt looks like git-am is in progress. Cannot rebase.It seems that there is already a $state_dir_base directory, and I wonder if you are in the middle of another rebase. If that is the case, please try $cmd_live_rebase If that is not the case, please $cmd_clear_stale_rebase and run me again. I am stopping in case you still have something valuable there.Join two or more development histories togetherList, create, or delete branchesMainline was specified but commit %s is not a merge.Malformed ident string: '%s'Malformed input line: '%s'.Malformed options sheet: %sMaybe you wanted to say 'git add .'? Merge with strategy %s failed. Merging:Missing author: %sMissing branch name; try -bMissing notes on source object %s. Cannot copy.Move or rename a file, a directory, or a symlinkMultiple remote HEAD branches. Please choose one explicitly with:Need a repository to create a bundle.Need a repository to unbundle.Need exactly one range.No annotated tags can describe '%s'. However, there were unannotated tags: try --tags.No branch name specifiedNo changesNo changes - did you forget to use 'git add'? If there is nothing left to stage, chances are that something else already introduced the same changes; you might want to skip this patch.No changes -- Patch already applied.No changes selectedNo commit specified and merge.defaultToUpstream not set.No commits parsed.No configured push destination. Either specify the URL from the command-line or configure a remote repository using git remote add and then push using the remote name git push No current branch.No default upstream defined for the current branch.No existing author found with '%s'No local changes to saveNo logfile givenNo merge message -- not updating HEAD No merge strategy handled the merge. No names found, cannot describe anything.No note found for object %s.No paths with --include/--only does not make sense.No rebase in progress?No remote for the current branch.No remote repository specified. Please, specify either a URL or a remote name from which new revisions should be fetched.No remote tracking branch for %s from %sNo stash found.No submodule mapping found in .gitmodules for path '$sm_path'No such URL found: %sNo such branch: '%s'No such remote '%s'No such remote or remote group: %sNo such remote: %sNo tags can describe '%s'. Try --always, or create some tags.No upstream configured for branch '%s'No url found for submodule path '$sm_path' in .gitmodulesNon-fast-forward commit does not make sense into an empty headNope. Not a git repositoryNot a range.Not a valid object name %sNot a valid ref: %sNot all child objects of %s are reachableNot committing merge; use 'git commit' to complete the merge. Not currently on any branch.Not handling anything other than two heads merge.Not possible to fast-forward, aborting.Not removing %s Not updating non-default fetch refspec %s Please update the configuration manually if necessary.Note: A branch outside the refs/remotes/ hierarchy was not removed; to delete it, use:Note: Some branches outside the refs/remotes/ hierarchy were not removed; to delete them, use:Nothing specified, nothing added. Object %s has no note On branch Only one StGIT patch series can be applied at onceOnly one of --include/--only/--all/--interactive/--patch can be used.Only one of -c/-C/-F/--fixup can be used.Option "%s" is ignored for %s Option "%s" value "%s" is not valid for %sOption --ignore-missing can only be used together with --dry-runOption -m cannot be combined with -c/-C/-F/--fixup.Options --squash and --fixup cannot be used togetherOverwriting existing notes for object %s Patch does not have a valid e-mail address.Patch failed at $msgnum $FIRSTLINEPatch format $patch_format is not supported.Patch format detection failed.Patch is empty. Was it split wrong? If you would prefer to skip this patch, instead run "$cmdline --skip". To restore the original branch and stop patching run "$cmdline --abort".Path '%s' is in submodule '%.*s'Paths with -a does not make sense.Please call 'bisect_state' with at least one argument.Please commit or stash them.Please enter a commit message to explain why this merge is necessary, especially if it merges an updated upstream into a topic branch. Lines starting with '#' will be ignored, and an empty message aborts the commit. Please enter the commit message for your changes. Lines starting with '#' will be ignored, and an empty message aborts the commit. Please enter the commit message for your changes. Lines starting with '#' will be kept; you may remove them yourself if you want to. An empty message aborts the commit. Please make up your mind. --skip or --abort?Please supply the message using either -m or -F option. Please supply the note contents using either -m or -F optionPrevious HEAD position wasPrint lines matching a patternPruning %sPull is not possible because you have unmerged files.Pull is not possible because you have unmerged files. Please, fix them up in the work tree, and then use 'git add/rm ' as appropriate to mark resolution, or use 'git commit -a'.Pushing to %s Receiving objectsRecord changes to the repositoryRefusing to create empty bundle.Refusing to fetch into current branch %s of non-bare repositoryRefusing to rewrite notes in %s (outside of refs/notes/)Reinitialized existingRejected hunk #%d.Remote branch %s not found in upstream %sRemove files from the working tree and from the indexRemoving %sRemoving %s Removing %s to make room for subdirectory Removing note for object %s Renamed a misnamed branch '%s' awayRenaming %s to %s Renaming %s to %s and %s to %s insteadRepository has been updated, but unable to write new_index file. Check that disk is not full or quota is not exceeded, and then "git reset HEAD" to recover.Repository lacks necessary blobs to fall back on 3-way merge.Repository lacks these prerequisite commits:Reset branch '%s' Reset current HEAD to the specified stateResolve operation not in progress, we are not resuming.Resolving deltasRewinding the tree to pristine... SHA1 COLLISION FOUND WITH %s !See 'git help ' for more information on a specific command.Show changes between commits, commit and working tree, etcShow commit logsShow the working tree statusShow various types of objectsSkipped %s (merged same as existing)Squash commit -- not updating HEAD Squash commit into empty head not supported yetStopping at '$sm_path'; script returned non-zero status.Submodule '$name' ($url) registered for path '$sm_path'Submodule path '$sm_path' not initialized Maybe you want to use 'update --init'?Submodule path '$sm_path': checked out '$sha1'Submodule path '$sm_path': merged in '$sha1'Submodule path '$sm_path': rebased into '$sha1'Switched to a new branch '%s' Switched to and reset branch '%s' Switched to branch '%s' Synchronizing submodule url for '$name'The --cached option cannot be used with the --files optionThe --exec option must be used with the --interactive optionThe -b/--binary option has been a no-op for long time, and it will be removed. Please do not use it anymore.The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand. Please use 'git notes add -f -m/-F/-c/-C' instead. The branch '%s' is not fully merged. If you are sure you want to delete it, run 'git branch -D %s'.The bundle contains %d refThe bundle contains %d refsThe bundle records a complete history.The bundle requires this refThe bundle requires these %d refsThe current branch %s has multiple upstream branches, refusing to push.The current branch %s has no upstream branch. To push the current branch and set the remote as upstream, use git push --set-upstream %s %s The current patch is empty.The following path is ignored by one of your .gitignore files: $sm_path Use -f if you really want to add it.The following paths are ignored by one of your .gitignore files: The most commonly used git commands are:The note contents has been left in %sThe pre-rebase hook refused to rebase.The previous cherry-pick is now empty, possibly due to conflict resolution. If you wish to commit it anyway, use: git commit --allow-empty Otherwise, please use 'git reset' The tag message has been left in %s The upstream branch of your current branch does not match the name of your current branch. To push to the upstream branch on the remote, use git push %s HEAD:%s To push to the branch of the same name on the remote, use git push %s %s %sThere are too many unreachable loose objects; run 'git prune' to remove them.There is no merge to abort (MERGE_HEAD missing).Too many arguments.Too many revisions specified: $REVTrying merge strategy %s... Trying really trivial in-index merge... Two output directories?URL: %sUh oh. Your system reports no Git commands at all.Unable to add %s to databaseUnable to add merge result for '%s'Unable to checkout '$sha1' in submodule path '$sm_path'Unable to checkout submodule '$sm_path'Unable to fetch in submodule path '$sm_path'Unable to find current revision in submodule path '$sm_path'Unable to merge '$sha1' in submodule path '$sm_path'Unable to rebase '$sha1' in submodule path '$sm_path'Unable to update cache tree Unable to write index.Unable to write new index fileUnknown commit %sUnknown option for merge-recursive: -X%sUnknown subcommand: %sUnknown type: %dUnmerged paths:Unprocessed path??? %sUnstaged changes after refreshing the index:Unstaged changes after reset:UntrackedUntracked files not listed%sUnusable instruction sheet: %sUpdate of config-file failedUpdate remote refs along with associated objectsUpdated tag '%s' (was %s) Updates were rejected because a pushed branch tip is behind its remote counterpart. Check out this branch and merge the remote changes (e.g. 'git pull') before pushing again. See the 'Note about fast-forwards' in 'git push --help' for details.Updates were rejected because a pushed branch tip is behind its remote counterpart. If you did not intend to push that branch, you may want to specify branches to push or set the 'push.default' configuration variable to 'current' or 'upstream' to push only the current branch.Updates were rejected because the tip of your current branch is behind its remote counterpart. Merge the remote changes (e.g. 'git pull') before pushing again. See the 'Note about fast-forwards' in 'git push --help' for details.Updating %sUpdating %s..%s Upstream branch '%s' not stored as a remote-tracking branchUse -f if you really want to add them. Using both --reset-author and --author does not make senseUsing index info to reconstruct a base tree...Using the %s to prepare resolving by hand. WARNING: You called a Git command named '%s', which does not exist. Continuing under the assumption that you meant '%s'Warning: bisecting only with a bad commit.Warning: fetch updated the current branch head. Warning: fast-forwarding your working tree from Warning: commit $orig_head.Warning: you are leaving %d commit behind, not connected to any of your branches: %s Warning: you are leaving %d commits behind, not connected to any of your branches: %s We are not bisecting.When you have resolved this problem, run "$cmdline --resolved". If you prefer to skip this patch, run "$cmdline --skip" instead. To restore the original branch and stop patching, run "$cmdline --abort".When you have resolved this problem, run "git rebase --continue". If you prefer to skip this patch, run "git rebase --skip" instead. To check out the original branch and stop rebasing, run "git rebase --abort".Will not delete all non-push URLsWonderful. Would not remove %s Would remove %s Writing SQUASH_MSGYou appear to have cloned an empty repository.You are currently bisecting.You are currently cherry-picking.You are currently editing a commit during a rebase.You are currently rebasing.You are currently splitting a commit during a rebase.You are in the middle of a cherry-pick -- cannot amend.You are in the middle of a merge -- cannot amend.You are in the middle of an am session.You are not currently on a branch. To push the history leading to the current (detached HEAD) state now, use git push %s HEAD: You are on a branch yet to be bornYou are pushing to remote '%s', which is not the upstream of your current branch '%s', without telling me what to push to update which remote branch.You asked to amend the most recent commit, but doing so would make it empty. You can repeat your command with --allow-empty, or you can remove the commit entirely with "git reset HEAD^". You cannot combine --no-ff with --ff-only.You cannot combine --squash with --no-ff.You didn't specify any refspecs to push, and push.default is "nothing".You do not have a valid HEADYou do not have a valid HEAD.You do not have the initial commit yetYou have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists). Please, commit your changes before you can merge.You have not concluded your merge (MERGE_HEAD exists).You have not concluded your merge (MERGE_HEAD exists). Please, commit your changes before you can merge.You have nothing to amend.You have unmerged paths.You must edit all merge conflicts and then mark them as resolved using git addYou must specify a repository to clone.You need to give me at least one good and one bad revisions. (You can use "git bisect bad" and "git bisect good" for that.)You need to set your committer info firstYou need to specify a tag name.You need to start by "git bisect start"You need to start by "git bisect start". You then need to give me at least one good and one bad revisions. (You can use "git bisect bad" and "git bisect good" for that.)You seem to have moved HEAD since the last 'am' failure. Not rewinding to ORIG_HEADYou still have unmerged paths in your index did you forget to use 'git add'?Your branch and '%s' have diverged, and have %d and %d different commit each, respectively. Your branch and '%s' have diverged, and have %d and %d different commits each, respectively. Your branch is ahead of '%s' by %d commit. Your branch is ahead of '%s' by %d commits. Your branch is behind '%s' by %d commit, and can be fast-forwarded. Your branch is behind '%s' by %d commits, and can be fast-forwarded. Your index file is unmerged.Your local changes would be overwritten by cherry-pick.Your local changes would be overwritten by revert.Your name and email address were configured automatically based on your username and hostname. Please check that they are accurate. You can suppress this message by setting them explicitly: git config --global user.name "Your Name" git config --global user.email you@example.com After doing this, you may fix the identity used for this commit with: git commit --amend --reset-author [%s: ahead %d, behind %d][%s: ahead %d][%s: behind %d][ahead %d, behind %d][ahead %d][behind %d][deleted][new branch][new ref][new tag][rejected][tag update][up to date]`git %s' is aliased to `%s'a cherry-pick or revert is already in progressactionadd/addadded by them:added by us:addinfo_cache failed for path '%s'adding files failedafter resolving the conflicts, mark the corrected paths with 'git add ' or 'git rm 'after resolving the conflicts, mark the corrected paths with 'git add ' or 'git rm ' and commit the result with 'git commit'ahead allow overlapping hunksalso apply the patch (use with --stat/--summary/--check)annotated tag %s has no embedded nameannotated tag %s not availableapply a patch without touching the working treeapply changes matching the given pathapply the patch in reverseapplying to an empty historyattempt three-way merge if a patch does not applyavailable git commands in '%s'bad %sbad index version '%s'bad object %sbad object type.bad repository '%s'bad sourcebe more quietbe more verbosebe verbosebehind binary patch does not apply to '%s'binary patch to '%s' creates incorrect result (expecting %s, got %s)bisect run cannot continue any morebisect run failed: 'bisect_state $state' exited with error code $resbisect run failed: exit code $res from '$command' is < 0 or >= 128bisect run successblobblob expected for %s '%s'bogus committer info %sboth --cached and trees are given.both added:both deleted:both modified:branch '%s' does not point at a commitbranch '%s' not found.bugbug: unhandled diff status %cbuild a temporary index based on embedded index informationcan not move directory into itselfcan't fdopen 'show' output fdcan't open patch '%s'cannot abort from a branch yet to be borncannot be interactive without stdin connected to a terminal.cannot chdir to %scannot checkout %scannot close written keep file '%s'cannot copy '%s' to '%s'cannot create '%s'cannot do a partial commit during a cherry-pick.cannot do a partial commit during a merge.cannot fill %d bytecannot fill %d bytescannot fstat packfilecannot lock HEAD refcannot mkdir %scannot move directory over filecannot open %s: %scannot open %s: %s cannot open '%s'cannot open packfile '%s'cannot opendir '%s'cannot pread pack filecannot read $file for replayingcannot read %s: %scannot read '%s'cannot read existing object %scannot read object %scannot read object %s '%s'cannot read the indexcannot readlink '%s'cannot rename the current branch while not on any.cannot resolve HEADcannot stat '%s'cannot stat template '%s'cannot store index filecannot store pack filecannot strip one component off url '$remoteurl'cannot symlink '%s' '%s'cannot tell cwdcannot update HEAD refcannot use -a with -dcannot write keep file '%s'chain length = %d: %lu objectchain length = %d: %lu objectscherry-pick failedclean.requireForce defaults to true and neither -n nor -f given; refusing to cleanclean.requireForce set to true and neither -n nor -f given; refusing to cleanclosing file '%s'commit has empty messageconfusion beyond insanityconfusion beyond insanity in parse_pack_objects()contentcopied: %s -> %scorrupt binary patch at line %d: %.*scorrupt index filecorrupt patch at line %dcorrupt patch for subproject %scould not apply %s... %scould not create archive file '%s'could not create file '%s'could not create leading directories of '%s'could not create work tree dir '%s'.could not lookup commit %scould not open '%s'could not open '%s' for readingcould not open or read '%s'could not parse %scould not parse HEAD commitcould not parse newly created commitcould not read '%s'could not read MERGE_MODEcould not read MERGE_MSGcould not read SQUASH_MSGcould not read commit message: %scould not read log file '%s'could not read log from standard inputcould not redirect outputcould not revert %s... %scould not run gpg.could not run stash.could not verify the tag '%s'could not write branch description template: %scould not write commit templatecouldn't look up newly created commitcreatecreating '%s' faileddeflate error (%d)deletedeleted by them:deleted by us:deleted file %s still has contentsdeleted file still has contentsdeleted: %sdeleting '%s' faileddeleting branch '%s' that has been merged to '%s', but not yet merged to HEAD.delta base offset is out of bounddestination existsdestination path '%s' already exists and is not an empty directory.detached HEADdetect new or modified lines that have whitespace errorsdiff setup faileddiff_setup_done faileddirectory/filedo not know what to do with %06o %s '%s'do not trust the line counts in the hunk headersdon't apply changes matching the given pathdon't expect at least one line of contextdone. early EOFemacsclient version '%d' too old (< 22).empty commit set passedensure at least lines of context matcherror building treeserror while closing pack fileerror: unknown option for 'stash save': $option To provide a message, use git stash save -- '$option'failed to apply deltafailed to close pipe to 'show' for object '%s'failed to close rev-list's stdin: %sfailed to copy file to '%s'failed to create directory '%s'failed to create link '%s'failed to create path '%s'%sfailed to exec '%s': %sfailed to finish 'show' for object '%s'failed to open '%s'failed to push some refs to '%s'failed to read the cachefailed to remove %sfailed to stat %s failed to stat '%s'failed to symlink '%s'failed to unlink '%s'failed to unpack HEAD tree objectfailed to write commit objectfailed write to rev-list: %sfast-forwardablefatal: no such branch: $branch_namefetch --all does not make sense with refspecsfetch --all does not take a repository argumentfilefile/directoryfinished search at %s forced updateformat.headers without valuefound %u common ancestor:found %u common ancestors:git %s: failed to read the indexgit %s: failed to refresh the indexgit apply [options] [...]git apply: bad git-diff - expected /dev/null on line %dgit apply: bad git-diff - expected /dev/null, got %s on line %dgit apply: bad git-diff - inconsistent new filename on line %dgit apply: bad git-diff - inconsistent old filename on line %dgit archive: NACK %sgit archive: Remote with no URLgit archive: expected ACK/NAK, got EOFgit archive: expected a flushgit archive: protocol errorgit checkout: --detach does not take a path argumentgit checkout: --ours/--theirs, --force and --merge are incompatible when checking out of the index.git checkout: -f and -m are incompatiblegit checkout: updating paths is incompatible with switching branches.git checkout: updating paths is incompatible with switching branches. Did you intend to checkout '%s' which can not be resolved as commit?git commands available from elsewhere on your $PATHgit diff header lacks filename information when removing %d leading pathname component (line %d)git diff header lacks filename information when removing %d leading pathname components (line %d)git rm: unable to remove %sgit stash clear with parameters is unimplementedgit write-tree failed to write a treegit: '%s' is not a git command. See 'git --help'.gpg did not accept the datagpg failed to sign the datagrep: failed to create thread: %shardhint: %.*s ignore additions made by the patchignore changes in whitespace when finding contextignoring template %sin %0.1f seconds automatically...in the futureindex file corruptindex-pack diedinflate returned %dinsane git directory %sinsane in-reply-to: %sinsanely long object directory %.*sinsanely long symlink %sinsanely long template name %sinsanely long template path %sinstead of applying the patch, output a summary for the inputinstead of applying the patch, output diffstat for the inputinstead of applying the patch, see if the patch is applicableinteractive add failedinternal errorinternal error in revision walkinvalid %sinvalid blob object %sinvalid branch.%s.merge; cannot rebase onto > 1 branchinvalid commit: %sinvalid object '%s' given.invalid option: %sinvalid path specificationinvalid reference: %sinvalid start of line: '%c'invalid upstream $upstream_namekeepleave the rejected hunks in corresponding *.rej fileslocal object %s is corruptlocal out of datemake sure the patch is applicable to the current indexmake_cache_entry failed for path '%s'malformed --author parametermalformed object at '%s'malformed object name %smalformed object name '%s'memory exhaustedmergemerge returned no commitmerge-recursive: disk full?merges with remote %smerging of trees %s and %s failedmissing binary patch data for '%s'mixedmodifiedmodified content, modified: %smodifymore than %d trees given: '%s'more than %i tags found; listed %i most recent gave up search at %s more than one %smore than two blobs given: '%s'multiple sources for the same targetnname of output directory is too longnew commits, new file %s depends on old contentsnew file depends on old contentsnew file: %snew mode (%o) of %s does not match old mode (%o)new mode (%o) of %s does not match old mode (%o) of %sno changes added to commit%s no cherry-pick or revert in progressno files addedno info viewer handled the requestno man viewer handled the requestno pattern given.no remote specifiedno such userno tag exactly matches '%s'no tag message?no-op (backward compatibility)non delta: %d objectnon delta: %d objectsnot a valid object: %snot copying templates of a wrong format version %d from '%s'not deleting branch '%s' that is not yet merged to '%s', even though it is merged to HEAD.not removing '%s' recursively without -rnot under version controlnothing added to commit but untracked files present%s nothing to commit%s numobject %s is not a blobobject %s not foundobject of unexpected typeobject type mismatch at %soffset value overflow for delta base objectonly one -F or -m option is allowed.oopsoption %s does not accept negative formoverwriting '%s'pack has %d unresolved deltapack has %d unresolved deltaspack has bad object at offset %lu: %spack has junk at the endpack is corrupted (SHA1 mismatch)pack signature mismatchpack too large for current definition of off_tpack-objects diedpackfile name '%s' does not end with '.pack'patch failed: %s:%ldpatch fragment without header at line %d: %.*spatch with only garbage at line %dpathpath %s has been renamed/deletedpath '%s' does not have all necessary versionspath '%s' does not have necessary versionspath '%s' does not have our versionpath '%s' does not have their versionpath '%s' is unmergedpath '%s': cannot mergepaths are separated with NUL characterpathspec '%s' did not match any filespremature end of pack file, %lu byte missingpremature end of pack file, %lu bytes missingprepend to all filenamesprevious rebase directory $dotest still exists but mbox given.program errorread error on inputread of %s failedread-tree failedrebases onto remote %srecount: unexpected line: %.*sref '%s' is excluded by the rev-list optionsreference is not a tree: %sreference repository '%s' is not a local directory.refusing to lose untracked file at '%s'regexec returned %d for input: %sremote %s already exists.remote HEAD refers to nonexistent ref, unable to checkout. remote branch '%s' not found.remote error: %sremoval patch leaves file contentsremove '%s' remove leading slashes from traditional diff pathsrenamerenamedrenamed: %s -> %srenaming '%s' failedrepo URL: '$repo' must be absolute or begin with ./|../repository '%s' does not existrev-list diedrevert failedrevision walk setup failedrootrunning $commandsearching to describe %s serious inflate inconsistencyshows number of added and deleted lines in decimal notationsoftsome local refs could not be updated; try running 'git remote prune %s' to remove any old, conflicting branchessome refs could not be readsource directory is emptyspecifying a master branch makes no sense with --mirrorspecifying branches to track makes sense only with fetch mirrorssquelched %d whitespace errorsquelched %d whitespace errorsstandard output, or directory, which one?stash failedstored pre-cherry-pick HEAD file '%s' is corruptsubmoduleswitch 'points-at' requires an objectswitch `%c' expects a numerical valueswitch `m' requires a valuetag '%s' already existstag '%s' is really '%s' heretag '%s' not found.tag header too big.tag name too long: %.*s...tag shorthand without templates not found %stimetolerate incorrectly detected missing new-line at the end of filetoo few parameterstoo many parameterstoo many paramstraversed %lu commits truncating .rej filename to %.*s.rejtry "git cherry-pick (--continue | --quit | --abort)"typechange: %sunable to add cache entry for %sunable to create '%s'unable to create backing store for newly created file %sunable to create temporary indexunable to deflate appended object (%d)unable to find filename in patch at line %dunable to grep from object of type %sunable to handle file type %dunable to look up current user in the passwd file: %sunable to move %s to %sunable to open or read %sunable to parse value '%s' for option %sunable to read %sunable to read index fileunable to read symlink %sunable to read tree (%s)unable to refresh indexunable to remove %s from indexunable to sign the tagunable to start 'show' for object '%s'unable to stat newly created file '%s'unable to update local refunable to write %sunable to write file '%s' mode %ounable to write new index fileunable to write new_index fileunable to write note objectunable to write tag fileunable to write temporary index fileunexpected diff status %cunexpected end of fileunexpected mode $mod_dstunhandled object '%s' given.unknown mirror argument: %sunknown object type %dunknown: %sunmerged: %sunrecognised option: '$arg'unrecognized argument: %sunrecognized binary patch at line %dunrecognized header: %s%s (%d)unrecognized help format '%s'unrecognized inputunrecognized whitespace ignore option '%s'unrecognized whitespace option '%s'unsupported index version %sunsupported object type in the treeuntracked content, up to dateupdating an unborn branch with changes added to the indexupdating files failedusage: %susage: %s%suse digits to display SHA-1sused more bytes than were availablewhenwhile searching for: %.*swon't bisect on seeked treeworking tree '%s' already exists.you need to resolve your current index firstProject-Id-Version: Git Report-Msgid-Bugs-To: Git Mailing List POT-Creation-Date: 2012-08-06 23:47+0800 PO-Revision-Date: 2012-08-07 01:07+0800 Last-Translator: Jiang Xin Language-Team: GitHub Language: zh_CN MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Plural-Forms: nplurals=2; plural=(n != 1); # # 输入一个 tag 说明 # 以 '#' 开头的行将被忽略。 # # # 输入一个 tag 说明 # 以 '#' 开头的行将被忽略，您可以删除它们如果您想这样做。 # 您指的是这个么？ 您指的是这其中的某一个么？ 似乎您正在做一个拣选提交。如果不对，请删除文件 %s 然后重试。 似乎您正在做一个合并提交。如果不对，请删除文件 %s 然后重试。 为了永久地选择任一选项，参见 'git help config' 中的 push.default。 %-*s 强制推送至 %-*s (%s) %-*s 强制推送至 %s %-*s 推送至 %-*s (%s) %-*s 推送至 %s %s 且有远程 （%s 已成为悬空状态） （%s 将成为悬空状态） 且有远程 或：%s （一旦您工作目录提交干净后，运行 "git rebase --continue"） （解决所有冲突后，执行 "git commit"） （所有冲突已解决：运行 "git rebase --continue"） （提交或丢弃子模组中未跟踪或修改的内容） （解决冲突并运行 "git commit"） （解决冲突，然后运行 "git am --resolved"） （解决冲突，然后运行 "git rebase --continue"） （不能更新本地引用） （使用 "git %s ..." 以包含要提交的内容） （使用 "git add ..." 标记解决方案） （使用 "git add ..." 更新要提交的内容） （酌情使用 "git add/rm ..." 标记解决方案） （使用 "git add/rm ..." 更新要提交的内容） （使用 "git am --abort" 恢复原有分支） （使用 "git am --skip" 跳过此补丁） （使用 "git bisect reset" 以回到原有分支） （使用 "git checkout -- ..." 丢弃工作区的改动） （使用 "git commit --amend" 修补当前提交） （使用 "git commit" 结束合并） （使用 "git rebase --abort" 以检出原有分支） （当您对您的修改满意后执行 "git rebase --continue"） （使用 "git rebase --skip" 跳过此补丁） （使用 "git reset %s ..." 撤出暂存区） （使用 "git rm --cached ..." 撤出暂存区） （使用 "git rm ..." 标记解决方案） 无法解析 dirstat 阈值 '%.*s' 获取地址：%s HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）： HEAD分支：%s 为 'git pull' 配置的本地分支： 为 'git pull' 配置的本地分支： 为 'git push' 配置的本地引用%s： 为 'git push' 配置的本地引用%s： 本地引用将在 'git push' 时被镜像 推送地址：%s 远程分支：%s 远程分支：%s 未知 dirstat 参数 '%.*s' 警告：$name 未包含提交 $sha1_dst 警告：$name 未包含提交 $sha1_src 警告：$name 未包含提交 $sha1_src 和 $sha1_dst %d 个文件被修改 %d 个文件被修改 %s 已成为悬空状态！ %s 将成为悬空状态！（新建/拷贝的文件使用 "git add" 建立跟踪）（留下未解决） （无可压缩）（根提交）（状态未查询）（使用 "git add" 和/或 "git commit -a"）（使用 "git add" 建立跟踪）（使用 -u 参数显示未跟踪的文件）（使用 -u 显示未跟踪文件）（干净的工作区） * [已删除] %s * [将删除] %s ... 及其它 %d 个。 0 个文件被修改 ??? 与远程 %s 合并 新的（下一次获取将存储于 remotes/%s）共享 过时（使用 'git remote prune' 来移除） 已跟踪! %-*s %-*s -> %s （在当前分支下不能获取）要提交的子模组变更：# 子模组已修改但尚未更新：$onto_name: 有一个以上的合并基准$onto_name: 没有合并基准$reference 不是有效的引用${REV}：不能丢弃进度条目%d 行有空白字符误用。%d 行有空白字符误用。%lu 天之前%lu 天之前%lu 小时之前%lu 小时之前%lu 分钟之前%lu 分钟之前%lu 个月之前%lu 个月之前%lu 秒钟之前%lu 秒钟之前%lu 周之前%lu 周之前%lu 年%lu 年%lu 年前%lu 年前%s %s 不是一个提交!不允许 %s（或 --work-tree=）而没有指定 %s（或 --git-dir=）%s - 不能被合并%s 已经存在%s 未发送所有必须的对象 %s 存在且不是一个目录%s文件：%s 的类型是 %o，应为 %o%s 是 %s 中的一个目录而以 %s 为名被添加%s 不是一个有效的 '%s' 对象%s 可以 不能对裸版本库进行%s重置%s%s Git 版本库于 %s%s %s，%lu 个月之前%s，%lu 个月之前%s，源=%s，目标=%s%s：%s%s：%s 不能和 %s 同时使用%s：无法写入新索引文件%s：已经存在于索引中%s：已经存在于工作区中%s：不能锁定引用%s：不能解析父提交 %s%s：不能更新引用%s：不存在于索引中%s：和索引不匹配%s：补丁未应用%s：错误类型%s作者： %s%s提交者： %s'$arg' 看起来不像是一个有效的版本'$args' 不是一个 stash 引用'$args' 不是 stash 样提交'$invalid' 不是一个有效的提交'$sm_path' 已存在且不是一个有效的 git 版本库'$sm_path' 已经存在于索引中'%s' 像是一个 git 命令，但却无法运行。 可能是 git-%s 受损？'%s' 不像是一个 v2 版本的包文件'%s' 没有指向一个提交'%s' 有变更已暂存至索引中 （使用 --cached 保存文件，或用 -f 强制删除）'%s' 有本地修改 （使用 --cached 保存文件，或用 -f 强制删除）'%s' 暂存的内容和工作区及 HEAD 中的都不一样 （使用 -f 强制删除）'%s' 位于符号链接中'%s' 不是一个提交'%s' 不是一个有效的远程名称'%s' 不是一个有效的tag名称。'%s'：%s'%s': 支持的 man 手册查看器命令。 请使用 'man..path'。'%s'：不是一个正规文件或符号链接'%s'：不支持的 man 手册查看器的路径。 请使用 'man..cmd'。'%s'：读取不完整 %s'%s'：无法读取 %s'%s'：未知的 man 查看器。'git bisect bad' 只能带一个参数。（为恢复数据输入 "git stash apply"）（坏提交） （删除）（匹配）(无 URL)（非分支）（非快进式）（无）（正从标准输入中读取日志信息） * 远程 %s** 警告：文件 %s 成为空文件但并未删除，删除 %d 行(-)，删除 %d 行(-)，插入 %d 行(+)，插入 %d 行(+)，落后 --3way 在一个版本库之外--[no-]exclude-standard 不能用于已跟踪内容。--add --delete 无意义--all 和 --mirror 不兼容--all 和 --tags 不兼容--all 不能和引用表达式同时使用--bare 和 --origin %s 选项不兼容。--cached 或 --untracked 不能与 --no-index 同时使用。--cached 在一个版本库之外--check 无意义--column 和 --verbose 不兼容--column 和 -n 不兼容--command 必须是第一个参数--contains 选项只允许和 -l 同时使用。--delete 未接任何引用没有意义--delete 与 --all、--mirror 及 --tags 不兼容--delete 只接受简单的目标引用名--depth 在本地克隆被忽略，改为 file:// 协议试试。--detach 不能和 -b/-B/--orphan 同时使用--detach 不能和 -t 同时使用--dirty 不能与提交同时使用--fix-thin 不能和 --stdin 同时使用--index 在一个版本库之外--long 与 --abbrev=0 不兼容--mirror 和 --tags 不兼容--mirror 不能和引用表达式同时使用--mirror 选项危险且过时，请使用 --mirror=fetch 或 --mirror=push--mixed 带路径已弃用，而是用 'git reset -- '。--name-only 无意义--name-status 无意义--no-index 或 --untracked 不能和版本同时使用。--open-files-in-pager 仅用于工作区--orphan 和 -b|-B 互斥--orphan 不能和 -t 同时使用--ours/--theirs 和切换分支不兼容。--patch 与 --{hard,mixed,soft} 不兼容--patch 选项和其他选项不兼容--points-at 选项只允许和 -l 同时使用。--reset-author 只能和 -C、-c 或 --amend 同时使用。--subject-prefix 和 -k 互斥。--track 需要一个分支名--verify 没有提供包名参数-A 和 -u 选项互斥-B 不能和 -b 同时使用'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义-n 和 -k 互斥。-n 选项只允许和 -l 同时使用。-x 和 -X 不能同时使用...：可能是一个目录/文件冲突？?? 您在说什么?终止提交因为提交说明为空。 终止提交；您未更改来自模版的提交说明。 添加文件内容至索引添加 %s而是以 %s 为名添加添加位于 '$sm_path' 的现存版本库到索引添加合并后的 %s所有冲突已解决但您仍处于合并中。已经位于 '%s' 已经是最新的！成功应用补丁 %s。应用？[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all 应用 %%s 个补丁，其中 %d 个被拒绝...应用 %%s 个补丁，其中 %d 个被拒绝...正应用：$FIRSTLINE您确认么[Y/n]？ 自动打包版本库以求最佳性能。 自动打包版本库以求最佳性能。您还可以手动运行 "git gc"。 参见 "git help gc" 以获取更多信息。 自动合并 %s自动合并失败，修正冲突然后提交修正的结果。 自动合并进展顺利，按要求在提交前停止 可用的自定义策略有：可用的策略有：坏的 %s 值：'%s'坏的 HEAD - 我需要一个 HEAD坏的 HEAD - 奇怪的符号引用坏的 bisect_write 参数：$state坏的 branch.%s.mergeoptions 字符串：%s坏的 notes.rewriteMode 值：'%s'输入坏的版本：$arg输入坏的版本：$rev分支被重命名，但更新 config 文件失败分支重命名失败分支重命名为 %s，但 HEAD 没有更新！冲突（%s）：合并冲突于 %s冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中的版本保留于 %8$s 中。冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中的版本被保留。冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s冲突（重命名/重命名）：在分支 "%3$s" 中重命名 "%1$s"->"%2$s"，在分支 "%6$s" 中重命名 "%4$s"->"%5$s"%7$s冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->%5$s只能将一个提交合并到空分支上不能对 '%s' 执行 reflog 操作 不能拣选到空分支不能作为初始提交还原无法 %s 在一个 %s 过程中不能访问当前工作目录不能访问工作区 '%s'不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解无法在合并过程中恢复进度无法返回当前工作目录不能提交未初始化/未引用的注解树不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解无法删除您当前所在的分支 '%s'。无法确定远程 HEAD不能带路径进行%s重置。在合并过程中不能做%s重置操作。无法求助于三路合并。不能得到 %s 的提交说明无法初始化 stash无法将多个分支合并到空分支无法打开现存包文件 '%s'无法为 %s 打开包索引文件无法打开补丁文件 %s不能覆盖无法准备时间戳正则表达式 %s不能读取 HEAD无法读取索引无法变基到多个分支不能记录工作区状态无法删除临时索引（不应发生）无法删除工作区变更无法保存当前索引状态无法保存当前状态无法保存当前工作区状态无法切换分支到一个非提交。无法还原修改的文件变更从 $mb 到 $onto：尚未暂存以备提交的变更：要提交的变更：检出 '$start_head' 失败。尝试 'git bisect reset '。检查补丁 %s...检查 '%s' 到 '%s' 的重命名 检出一个分支或路径到工作区聪明... 在索引不干净下修补最后的提交。克隆一个版本库到一个新目录无法克隆 '$url' 到子模组路径 '$sm_path'正克隆到 '%s'... 克隆到裸版本库 '%s'... 提交 %s 没有父提交 %d提交 %s 是一个合并提交但未提供 -m 选项。提交内容为：提交您的修改或保存进度后再继续。索引中有冲突。尝试不使用 --index。上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段损坏的 MERGE_HEAD 文件（%s）不能追加 '%s'不能添加 '%s' 至 '%s'不能应用 '%s'不能检出原始 HEAD '$branch'。 尝试 'git bisect reset '。不能创建目录 '%s'不能创建 git link %s不能创建序列目录 %s无法删除 %s不能获取 %s不能找到跟踪的远程分支，请手工指定 。 不能找到合并策略 '%s'。 不能发现要克隆的远程分支 %s。不能格式化 %s。无法得到引用表达式 %s 的获取列表不能设置 %s 为组可写无法移回 $head_name不能打开 %s不能为写入打开 '%s'不能打开 '%s' 以写入。不能解析提交 %s 不能解析第 %d 行。不能解析对象 '%s'不能解析对象 '%s'。不能解析父提交 %s 不能读取 %s。不能从 '%s' 读取不能读取索引不能读取对象 %s不能读取索引无法移除分支 %s不能移除配置小节 '%s'不能重命名配置小节 '%s' 到 '%s'不能重置索引文件至版本 '%s'。不能解析 HEAD 提交 不能执行 'git rev-list'不能保存索引树不能设置 '%s'不能设置 %s无法设置 master '%s'不能生成 pack-objects 进程不能查看文件状态 '%s'不能写入新的索引文件。不能生成补丁不能写入 %s不能写入 '%s'无法发现远程 HEAD 引用无法查询 '%s' 指向的提交对象无法查询 HEAD 指向的提交对象信封需要邮件地址格式创建一个空的 git 版本库或者重新初始化一个创建、列出、删除或校验一个GPG签名的 tag 对象当前分支 $branch_name 是最新的，强制变基。当前分支 $branch_name 是最新的。已删除分支 %s（曾为 %s）。 已删除远程分支 %s（曾为 %s）。 已删除 tag '%s'（曾为 %s） 您是否曾手动编辑过您的补丁？ 无法应用补丁到索引中的二进制对象（blob）上。脏的索引：不能应用补丁（脏文件：$files）您想让我为您这样做么[Y/n]？ 没有指向一个有效的提交：$onto_name不知道如何克隆 %s不知道如何从 %s 获取从另外一个版本库下载对象和引用丢弃了 ${REV} ($s)空提交信息。空补丁。异常终止。正在进入 '$prefix$sm_path'无法创建树对象删除分支 '%s' 时出错删除远程分支 '%s' 时出错对象中出错错误收尾 %s错误收尾 %s。指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths...无法添加子模组 '$sm_path'无法切换目录：%s无法从 '%s' 到 '%s' 拷贝注解无法创建输出文件无法执行内部合并无法找到 %s 指向的树。无法找到 HEAD 指向的树。无法合并变更。无法解析 --dirstat/-X 选项的参数： %s无法解析 emacsclient 版本。无法读取对象 '%s'。无法递归进子模组路径 '$sm_path'无法注册子模组 '$sm_path'无法为子模组路径 '$sm_path' 注册更新模式无法为子模组路径 '$sm_path' 注册 url无法解析 '%s' 为一个有效引用。无法将 HEAD 解析为有效引用。无法启动 emacsclient。转而在基础版本上打补丁及进行三路合并...快进 $branch_name 至 $onto_name。严重的合并错误，不应发生。获取并合并另外的版本库或一个本地分支正在获取 %s 获取组并指定引用表达式没有意义最终输出：%d %s 通过二分查找定位引入 bug 的变更完成 SQUASH_MSG首先，重置头指针以便在上面重放您的工作...请先在工作区改正文件，然后酌情使用 'git add/rm ' 标记解决方案， 或使用 'git commit -a'。本地提交转移至更新后的上游分支中发现配置变量 'diff.dirstat' 中的错误： %s来自 %.*s Gitdir '$a' 在子模组路径 '$b' 之下或者相反HEAD（非分支）HEAD 没有指向一个分支HEAD 目前位于HEAD 现在位于 %sHEAD 没有位于 /refs/heads 之下！嗯？%.*s 在索引中？第 #%d 个片段成功应用。块 #%d 成功应用于 %d (偏移 %d 行）块 #%d 成功应用于 %d (偏移 %d 行）如果您想要通过创建新分支保存他们，这可能是一个好时候。 如下操作： git branch new_branch_name %s 忽略的索引的进度没有被恢复。索引对象中初始提交初始提交于 初始化空的无效的 %s：'%s'无效的分支名：'%s'无效的清理模式 %s无效键名：%s无效的旧URL匹配模版：%s无效的未追踪文件参数 '%s'%s 的值无效：%s似乎正处于在 git-am 的执行过程中。无法变基。好像已有一个 $state_dir_base 目录，我怀疑您正处于另外一个变基过程中。 如果是这样，请尝试执行 $cmd_live_rebase 如果不是这样，请执行 $cmd_clear_stale_rebase 然后再重新执行变基。为避免您丢失重要数据，我已经停止当前操作。合并两个或更多开发历史列出、创建或删除分支指定了主线但提交 %s 不是一个合并。非法的身份字符串：'%s'非法的输入行：'%s'。非法的选项表单：%s也许您想要执行 'git add .'？ 使用策略 %s 合并失败。 合并：缺少作者：%s缺少分支名；尝试 -b源对象 %s 缺少注解。不能拷贝。移动或重命名一个文件、目录或符号链接多个远程 HEAD 分支。请明确地选择一个用命令：需要一个版本库来创建包。需要一个版本库来解包。只需要一个范围。没有注释 tag 能描述 '%s'。 然而，有非注释 tag：尝试 --tags。未指定分支名没有修改没有变更 —— 您是不是忘了执行 'git add'？ 如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。 您也许想要跳过这个补丁。没有变更 -- 补丁已经应用过。没有选择变更未指定提交并且 merge.defaultToUpstream 未设置。没有提交被解析。没有配置推送目标。 或者通过命令行指定URL，或者用下面命令配置一个远程版本库 git remote add 然后使用该远程版本库名执行推送 git push 没有当前分支。当前分支没有定义默认的上游分支。没有找到匹配 '%s' 的作者没有要保存的本地修改未提供日志文件无合并信息 -- 未更新 HEAD 没有合并策略处理此合并。 没有发现名称，无法描述任何东西。未发现对象 %s 的注解。参数 --include/--only 不跟路径没有意义。没有正在进行的变基？当前分支没有对应的远程版本库。未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。%s 没有来自 %s 的远程跟踪分支未发现 stash。未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射未找到此URL：%s没有此分支：'%s'没有此远程 '%s'没有这样的远程或远程组：%s没有这样的远程：%s没有注释 tag 能描述 '%s'。 尝试 --always，或者创建一些 tag。尚未给分支 '%s' 设置上游在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url到空分支的非快进式提交没有意义无。 不是一个 git 版本库不是一个范围。不是一个有效的对象名 %s不是一个有效引用：%s%s 的所有子对象并非都可达未提交合并，使用 'git commit' 完成此次合并。 当前不在任何分支上。不能处理两个头合并之外的任何操作。无法快进，终止。未删除 %s 没有更新非默认的获取引用表达式 %s 如果必要请手动更新配置。注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用：注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用：没有指定文件，也没有文件被添加。 对象 %s 没有注解 位于分支 一次只能有一个 StGIT 补丁队列被应用只能用一个 --include/--only/--all/--interactive/--patch 选项。只能用一个 -c/-C/-F/--fixup 选项。选项 "%s" 为 %s 所忽略 选项 "%s" 的值 "%s" 对于 %s 是无效的选项 --ignore-missing 只能和 --dry-run 同时使用选项 -m 不能和 -c/-C/-F/--fixup 同时使用。选项 --squash 和 --fixup 不能同时使用覆盖对象 %s 现存注解 补丁中没有一个有效的邮件地址。补丁失败于 $msgnum $FIRSTLINE不支持 $patch_format 补丁格式。补丁格式检测失败。补丁为空。是不是切分错误？ 如果您想要跳过这个补丁，执行 "$cmdline --skip"。 要恢复原分支并停止打补丁，执行 "$cmdline --abort"。路径 '%s' 属于模组 '%.*s'路径和 -a 选项同时使用没有意义。请在调用 'bisect_state' 时跟至少一个参数。请提交或为它们保存进度。请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支 合并到主题分支。 以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。 请为您的变更输入提交说明。以 '#' 开始的行将被忽略，而一个空的提交 说明将会终止提交。 请为您的变更输入提交说明。以 '#' 开始的行将被保留，您可以删除它们 如果您想这样做的话。而一个空的提交说明将会终止提交。 请下决心。--skip 或是 --abort ？请使用 -m 或者 -F 选项提供提交说明。 请通过 -m 或 -F 选项为注解提供内容之前的 HEAD 位置是输出和模式匹配的行修剪 %sPull 不可用，因为您尚有未合并的文件。Pull 不可用，因为您尚有未合并的文件。请先在工作区改正文件， 然后酌情使用 'git add/rm ' 标记解决方案， 或者使用 'git commit -a'。推送到 %s 接收对象中记录变更到版本库不能创建空包。拒绝获取到非裸版本库的当前分支 %s拒绝向 %s（在 refs/notes/ 之外）写入注解重新初始化现存的拒绝第 #%d 个片段。远程分支 %s 在上游 %s 未发现从工作区和索引中删除文件删除 %s正删除 %s 删除 %s 以便为子目录留出空间 删除对象 %s 的注解 重命名掉一个错误命名的旧分支 '%s'重命名 %s 至 %s 而是重命名 %s 至 %s 以及 %s 至 %s版本库已更新，但无法写 new_index 文件。检查是否磁盘已满 或磁盘配额已耗尽，然后执行 "git reset HEAD" 恢复。版本库缺乏必要的二进制对象（blob）以进行三路合并。版本库缺少这些必备的提交：重置分支 '%s' 重置当前HEAD到指定状态解决操作未进行，我们不会继续。处理 delta 中将树回滚至原始状态... 发现 %s 出现 SHA1 冲突！参见 'git help ' 以获得该特定命令的详细信息。显示提交之间、提交和工作区之间等的差异显示提交日志显示工作区状态显示各种类型的对象略过 %s（已经做过相同合并）压缩提交 -- 未更新 HEAD 尚不支持到空分支的压缩提交停止于 '$sm_path'，脚本返回非零值。子模组 '$name' ($url) 已为路径 '$sm_path' 注册子模组路径 '$sm_path' 没有初始化 也许您想用 'update --init'？子模组路径 '$sm_path'：检出 '$sha1'子模组路径 '$sm_path'：已合并入 '$sha1'子模组路径 '$sm_path'：变基至 '$sha1'切换到一个新分支 '%s' 切换并重置分支 '%s' 切换到分支 '%s' 为 '$name' 同步子模组 url选项 --cached 不能和选项 --files 同时使用选项 --exec 必须和选项 --interactive 同时使用参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被删除。 请不要再使用它了。子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。 请换用 'git notes add -f -m/-F/-c/-C'。 分支 '%s' 没有完全合并。 如果您确认要删除它，执行 'git branch -D %s'。这个包中含有 %d 个引用这个包中含有 %d 个引用这个包记录一个完整历史。这个包需要这个引用这个包需要 %d 个这些引用当前分支 %s 有多个上游分支，拒绝推送。当前分支 %s 没有对应的上游分支。 为推送当前分支并建立与远程上游的跟踪，使用 git push --set-upstream %s %s 当前的补丁为空。以下路径被您的一个 .gitignore 文件所忽略： $sm_path 如果您确实想添加它，使用 -f 参数。下列路径根据您的一个 .gitignore 文件而被忽略： 最常用的 git 命令有：注解内容被留在文件 %s 中钩子 pre-rebase 拒绝变基。之前的拣选操作现在是一个空提交，可能是由冲突解决导致的。如果您无论如何 也要提交，使用命令： git commit --allow-empty 否则，请使用命令 'git reset' tag 说明被保留在 %s 如果您当前分支的上游分支和您当前分支名不匹配，为推送到远程的 上游分支，使用 git push %s HEAD:%s 为推送至远程同名分支，使用 git push %s %s %s有太多不可达的松散对象，运行 'git prune' 删除它们。没有要终止的合并（MERGE_HEAD 丢失）。太多参数。指定了太多的版本：$REV尝试合并策略 %s... 尝试非常小的索引内合并... 两个输出目录？URL：%s唉呀，您的系统中未发现 Git 命令。不能添加 %s 至对象库无法为 '%s' 添加合并结果无法在子模组路径 '$sm_path' 中检出 '$sha1'不能检出子模组 '$sm_path'无法在子模组路径 '$sm_path' 中获取无法在子模组路径 '$sm_path' 中找到当前版本无法合并 '$sha1' 到子模组路径 '$sm_path' 中无法在子模组路径 '$sm_path' 中变基 '$sha1'不能更新缓存 不能写入索引。无法写入新索引文件未知提交 %smerge-recursive 的未知选项：-X%s未知子命令：%s未知类型：%d未合并的路径：未处理的路径??? %s刷新索引之后尚未被暂存的变更：重置后撤出暂存区的变更：未跟踪的未跟踪的文件没有列出%s无用的指令表单：%s无法更新 config 文件更新远程引用和相关的对象已更新tag '%s'（曾为 %s） 更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。 检出该分支并与远程变更合并（如 'git pull'），然后再推送。详见 'git push --help' 中的 'Note about fast-forwards' 小节。更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。 如果您并非有意推送该分支，您可以在推送时指定要推送的分支，或者将 配置变量 'push.default' 设置为 'current' 或 'upstream' 以便只推送当前分支。更新被拒绝，因为您当前分支的最新提交落后于其对应的远程分支。 再次推送前，先与远程变更合并（如 'git pull'）。详见 'git push --help' 中的 'Note about fast-forwards' 小节。更新 %s 中更新 %s..%s 上游分支 '%s' 没有存储为一个远程跟踪分支使用 -f 参数如果您确实要添加它们。 同时使用 --reset-author 和 --author 没有意义更新索引信息以重建基树...使用 %s 以准备手工解决。 警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的 是 '%s'警告：在仅有一个坏提交下进行二分查找。警告：fetch 更新了当前的分支。您的工作区 警告：从原提交 $orig_head 快进。警告：您正丢下 %d 个提交，未和任何分支关联： %s 警告：您正丢下 %d 个提交，未和任何分支关联： %s 我们没有在二分查找。当您解决了此问题后，执行 "$cmdline --resolved"。 如果您想跳过此补丁，则执行 "$cmdline --skip"。 要恢复原分支并停止打补丁，执行 "$cmdline --abort"。当您解决了此问题后，执行 "git rebase --continue"。 如果您想跳过此补丁，则执行 "git rebase --skip"。 要恢复原分支并停止变基，执行 "git rebase --abort"。将不会删除所有非推送URL地址太棒了。 不会删除 %s 将删除 %s 写入 SQUASH_MSG您似乎克隆了一个空版本库。您正在做二分查找。您正在做拣选操作。您正在变基过程中编辑一个提交。您正在变基。您正在变基过程中拆分一个提交。您正处于一个拣选过程中 -- 无法修补提交。您正处于一个合并过程中 -- 无法修补提交。您正处于一个 am 过程中。您当前不在一个分支上。 现在为推送当前（分离头指针）的历史，使用 git push %s HEAD: 您位于一个尚未初始化的分支您正推送至远程 '%s'（其并非当前分支 '%s' 的上游）， 而没有告诉我要推送什么、更新哪个远程分支。您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上 --allow-empty 选项，或者您可用命令 "git reset HEAD^" 整个删除该提交。 您不能将 --no-ff 与 --ff-only 同时使用。您不能将 --squash 与 --no-ff 同时使用。您没有为推送指定任何引用表达式，并且 push.default 为 "nothing"。您没有一个有效的 HEAD您没有一个有效的 HEAD。您尚未建立初始提交您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。 请在合并前先提交您的修改。您尚未结束您的合并（存在 MERGE_HEAD）。您尚未结束您的合并（存在 MERGE_HEAD）。 请在合并前先提交您的修改。您没有可修补的提交。您有尚未合并的路径。您必须编辑所有的合并冲突，然后通过 git add 命令将它们标记为已解决您必须指定一个版本库来克隆。您需要给我至少一个好版本和一个坏版本。 （您可以用 "git bisect bad" 和 "git bisect good" 命令来标识。）您需要先设置你的提交者信息您需要指定一个 tag 名称。您需要执行 "git bisect start" 来开始您需要执行 "git bisect start" 来开始。 然后需要提供我至少一个好版本和一个坏版本。 （您可以用 "git bisect bad" 和 "git bisect good" 命令来标识。）您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD您的索引中仍有未合并的路径。您是否忘了执行 'git add'？您的分支和 '%s' 出现了偏离， 并且分别有 %d 和 %d 处不同的提交。 您的分支和 '%s' 出现了偏离， 并且分别有 %d 和 %d 处不同的提交。 您的分支领先 '%s' 共 %d 个提交。 您的分支领先 '%s' 共 %d 个提交。 您的分支落后 '%s' 共 %d 个提交，并且可以快进。 您的分支落后 '%s' 共 %d 个提交，并且可以快进。 您的索引文件未完成合并。您的本地修改将被拣选操作覆盖。您的本地修改将被还原操作覆盖。您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确 与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息： git config --global user.name "Your Name" git config --global user.email you@example.com 设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份： git commit --amend --reset-author [%s：领先 %d，落后 %d][%s：领先 %d][%s：落后 %d][领先 %d，落后 %d][领先 %d][落后 %d][已删除][新分支][新引用][新tag][已拒绝][tag更新][最新]`git %s' 是 `%s' 的别名一个拣选或还原操作已在进行动作添加/添加由他们添加：由我们添加：为路径 '%s' addinfo_cache 失败添加文件失败冲突解决完毕后，用 'git add ' 或 'git rm ' 命令标记修正后的文件冲突解决完毕后，用 'git add ' 或 'git rm ' 对修正后的文件做标记，然后用 'git commit' 提交领先 允许重叠的补丁片段还应用此补丁（与 --stat/--summary/--check 选项同时使用）注释 tag %s 没有嵌入名称注释 tag %s 无效应用补丁而不修改工作区应用与给出路径向匹配的变更反向应用补丁正应用到一个空历史上如果一个补丁不能应用则尝试三路合并在 '%s' 下可用的 git 命令错误选项 %s坏的索引版本 '%s'坏对象 %s坏的对象类型。坏的版本库 '%s'坏的源更加安静更加详细冗长输出落后 二进制补丁未应用到 '%s'到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）二分查找不能继续运行二分查找运行失败： 'bisect_state $state' 退出码为 $res二分查找运行失败： 命令 '$command' 的退出码 $res 或者小于 0 或者大于等于 128二分查找运行成功二进制对象%s '%s' 应为二进制对象（blob）虚假的提交者信息 %s同时给出了 --cached 和树对象。双方添加：双方删除：双方修改：分支 '%s' 未指向一个提交分支 '%s' 未发现。bugbug：未处理的差异状态 %c创建一个临时索引基于嵌入的索引信息不能将目录移动到自身不能打开 'show' 输出文件句柄不能打开补丁 '%s'不能从尚未建立的分支终止标准输入没有和终端关联，不能进行交互式操作。不能切换目录到 %s不能检出 %s无法关闭保留文件 '%s'不能拷贝 '%s' 至 '%s'不能创建 '%s'在拣选过程中不能做部分提交。在合并过程中不能做部分提交。无法填充 %d 字节无法填充 %d 字节不能枚举包文件状态无法锁定 HEAD 引用不能创建目录 %s不能将目录移动到文件不能打开 %s：%s无法打开 %s：%s 不能打开 '%s'无法打开包文件 '%s'不能打开目录 '%s'无法读取包文件不能读取 $file 来重放不能读取 %s：%s不能读取 '%s'不能读取现存对象 %s不能读取对象 %s不能读取对象 %s '%s'无法读取索引不能读取链接 '%s'无法重命名当前分支因为不处于任何分支上。不能解析 HEAD不能枚举 '%s' 状态不能枚举模版 '%s' 状态无法存储索引文件无法存储包文件无法从 url '$remoteurl' 剥离一个组件不能自 '%s' 到 '%s' 创建符号链接无法获知当前路径无法更新 HEAD 引用不能将 -a 和 -d 同时使用无法写保留文件 '%s'链长 = %d: %lu 对象链长 = %d: %lu 对象拣选失败clean.requireForce 默认为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作clean.requireForce 设置为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作关闭文件 '%s'提交说明为空不可理喻parse_pack_objects() 中遇到不可理喻的问题内容拷贝： %s -> %s二进制补丁在第 %d 行损坏：%.*s损坏的索引文件补丁在第 %d 行损坏子项目 %s 损坏的补丁不能应用 %s... %s不能创建归档文件 '%s'不能创建文件 '%s'不能为 '%s' 创建先导目录不能为 '%s' 创建工作区目录。不能查询提交 %s不能打开 '%s'不能为读入打开 '%s'不能打开或读取 '%s'不能解析 %s不能解析 HEAD 提交不能解析新创建的提交不能读取 '%s'不能读取 MERGE_MODE不能读取 MERGE_MSG不能读取 SQUASH_MSG不能读取提交说明：%s不能读取日志文件 '%s'不能从标准输入中读取日志信息不能重定向输出不能还原 %s... %s不能执行 gpg。不能进行进度保存。不能校验 tag '%s'不能写分支描述模版：%s不能写提交模版无法找到新创建的提交创建创建 '%s' 失败压缩错误 (%d)删除由他们删除：由我们删除：删除的文件 %s 仍有内容删除的文件仍有内容删除： %s删除 '%s' 失败将要删除的分支 '%s' 已经被合并到 '%s'，但未合并到 HEAD。delta 基准偏移越界目标已存在目标路径 '%s' 已经存在，并且不是一个空目录。分离头指针检查新增和修改的行中间的空白字符滥用diff 设置失败diff_setup_done 失败目录/文件不知道如何处理 %06o %s '%s'不信任补丁片段的头信息中的行号不要应用与给出路径向匹配的变更无需至少一行上下文完成。 过早的文件结束符（EOF）emacsclient 版本 '%d' 太老 (< 22)。提供了空的提交集确保至少匹配 行上下文无法创建树关闭包文件时出错错误：'stash save' 的未知选项：$option 要提供一个描述信息，使用 git stash save -- '$option'无法应用 delta无法为对象 '%s' 的 'show' 关闭管道无法关闭 rev-list 的标准输入：%s无法拷贝文件至 '%s'无法创建目录 '%s'无法创建链接 '%s'无法创建路径 '%s'%s无法执行 '%s'：%s无法为对象 '%s' 完成 'show'无法打开 '%s'无法推送一些引用到 '%s'无法读取缓存无法删除 %s无法枚举 %s 状态 无法枚举 '%s' 状态无法创建符号链接 '%s'无法删除 '%s'无法解包 HEAD 树对象无法写提交对象无法写入 rev-list：%s可快进严重错误：无此分支：$branch_namefetch --all 带引用表达式没有任何意义fetch --all 不能带一个版本库参数文件文件/目录完成搜索 %s 强制更新format.headers 没有值发现 %u 个共同祖先：发现 %u 个共同祖先：git %s：无法读取索引git %s：无法刷新索引git apply [选项] [<补丁>...]git apply：错误的 git-diff - 第 %d 行处应为 /dev/nullgit apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$sgit apply：错误的 git-diff - 第 %d 行上新文件名不一致git apply：错误的 git-diff - 第 %d 行上旧文件名不一致git archive：NACK %sgit archive：未提供远程URLgit archive：应为ACK/NACK，却得到EOFgit archive：应为刷新git archive：协议错误git checkout：--detach 不跟路径参数git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。git checkout：-f 和 -m 不兼容git checkout：更新路径和切换分支不兼容。git checkout：更新路径和切换分支不兼容。 您是想要检出 '%s' 但未能将其解析为提交么？在 $PATH 路径中的其他地方可用的 git 命令当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）git rm：不能删除 %sgit stash clear 不支持参数git write-tree 无法写入一树对象git：'%s' 不是一个 git 命令。参见 'git --help'。gpg 没有接受数据gpg 无法为数据签名grep：无法创建线程：%s硬性提示：%.*s 忽略补丁中的添加的文件查找上下文时忽略空白字符的变更忽略模版 %s在 %0.1f 秒钟后自动运行...在将来索引文件损坏index-pack 终止解压缩返回 %d不正常的 git 目录 %s不正常的 in-reply-to：%s不正常的长对象目录 %.*s太长的符号链接 %s太长的模版名 %s太长的模版路径 %s不应用补丁，而是显示输入的概要不应用补丁，而是显示输入的差异统计（diffstat）不应用补丁，而是查看补丁是否可应用交互式添加失败内部错误在版本遍历时遇到内部错误无效的 %s无效的二进制对象（blob）%s无效的 branch.%s.merge，不能变基到一个以上的分支无效的提交：%s提供了无效对象 '%s'。无效选项：%s无效的路径规格无效引用：%s无效的行首字符：'%c'无效的上游 $upstream_name保持将拒绝的补丁片段保存在对应的 *.rej 文件中本地对象 %s 已损坏本地已过时确认补丁可以应用到当前索引对路径 '%s' 的 make_cache_entry 操作失败非法的 --author 参数非法的对象于 '%s'非法的对象名 %s非法的对象名 '%s'内存耗尽合并合并未返回提交merge-recursive：磁盘已满？与远程 %s 合并无法合并树 %s 和 %s缺失 '%s' 的二进制补丁数据混杂修改修改的内容, 修改： %s修改提供了超过 %d 个树对象：'%s'发现多于 %i 个 tag，列出最近的 %i 个 在 %s 放弃搜索 多于一个 %s提供了超过两个二进制对象（blob）：'%s'同一目标具有多个源数字输出目录名太长新提交, 新文件 %s 依赖旧内容新文件依赖旧内容新文件： %s%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配修改尚未加入提交%s 拣选或还原操作并未进行没有文件被添加没有 info 查看器处理此请求没有 man 查看器处理此请求未提供模式匹配。未指定远程无此用户没有 tag 准确匹配 '%s'无 tag 说明？空操作（向后兼容）非 delta：%d 个对象非 delta：%d 个对象不是一个有效对象：%s没有从 '%2$s' 复制带有错误版本 %1$d 的模版并未删除分支 '%s'， 虽然它已经合并到 HEAD， 然而却尚未被合并到分支 '%s' 。未提供 -r 选项不会递归删除 '%s'不在版本控制之下空提交但存在未跟踪文件%s 无须提交%s 数字对象 %s 不是一个二进制对象（blob）对象 %s 未发现意外的类型的对象%s 的对象类型不匹配偏移值覆盖了 delta 基准对象只允许一个 -F 或 -m 选项。哎哟选项 %s 不接受否定格式覆盖 '%s'包有 %d 个未解决的 delta包有 %d 个未解决的 delta包中有错误的对象位于 %lu：%s包的结尾有垃圾数据包冲突（SHA1 不匹配）包签名不匹配包太大超过了当前 off_t 的定义pack-objects 终止包名 '%s' 没有以 '.pack' 结尾打补丁失败：%s:%ld第 %d 行的补丁片段没有头信息：%.*s补丁文件的第 %d 行只有垃圾数据路径路径 %s 已经被重命名/删除路径 '%s' 没有全部必须的版本路径 '%s' 没有必须的版本路径 '%s' 没有我们的版本路径 '%s' 没有他们的版本路径 '%s' 未合并path '%s'：无法合并路径以 NUL 字符分隔路径 '%s' 未匹配任何文件包文件过早结束，缺少 %lu 字节包文件过早结束，缺少 %lu 字节为所有文件名前添加 <根目录>之前的变基目录 $dotest 仍然存在但给出了mbox。程序错误输入上的读错误读取 %s 失败读取树失败变基到远程 %srecount：意外的行：%.*s引用 '%s' 被 rev-list 选项排除引用不是一个树：%s引用版本库 '%s' 不是一个本地目录。拒绝丢弃 '%s' 中的未跟踪文件regexec 返回 %d，输入为：%s远程 %s 已经存在。远程 HEAD 指向一个不存在的引用，无法检出。 远程分支 '%s' 未发现。远程错误：%s移除补丁仍留下了文件内容删除 '%s' 从传统的 diff 路径中移除 <数字> 个前导路径重命名重命名重命名： %s -> %s重命名 '%s' 失败版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始版本库 '%s' 不存在rev-list 终止还原失败版本遍历设置失败根目录运行 $command搜索描述 %s 解压缩严重的不一致以数字方式显示添加或删除行的数量软性一些本地引用不能被更新；尝试运行 'git remote prune %s' 来删除旧的、有冲突的分支一些引用不能读取源目录为空指定一个 master 分支并使用 --mirror 选项没有意义指定要跟踪的分支只在与获取镜像同时使用才有意义抑制下仍有 %d 个空白字符误用抑制下仍有 %d 个空白字符误用标准输出或目录，哪一个？进度保存失败保存拣选提交前的 HEAD 文件 '%s' 损坏子模组开关 'points-at' 需要一个对象开关 `%c' 期望一个数字值开关 `m' 需要一个值tag '%s' 已存在tag '%s' 的确是在 '%s'tag '%s' 未发现。tag 头信息太大。tag 名字太长：%.*s...tag 简写没有跟 参数模版未找到 %s时间允许不正确的文件末尾换行符参数太少参数太多太多参数已遍历 %lu 个提交 截短 .rej 文件名为 %.*s.rej尝试 "git cherry-pick (--continue | --quit | --abort)"类型变更： %s无法为 %s 添加缓存条目不能创建 '%s'不能为新建文件 %s 创建后端存储不能创建临时索引不能缩小附加对象（%d）不能在补丁的第 %d 行找到文件名无法抓取来自于 %s 类型的对象不能处理 %d 类型的文件无法在 passwd 文件中查询到该用户：%s不能移动 %s 至 %s不能打开或读取 %s不能解析选项 %1$s 的值 '%2$s'不能读 %s无法读取索引文件无法读取符号链接 %s无法读取树（%s）无法刷新索引不能从索引中移除 %s无法签署 tag不能为对象 '%s' 开始 'show'不能枚举新建文件 '%s' 的状态不能更新本地引用不能写 %s不能写文件 '%s' 权限 %o无法写新的索引文件无法写 new_index 文件不能写注解对象无法写 tag 文件无法写临时索引文件意外的差异状态 %c意外的文件结束意外的模式 $mod_dst提供了无法处理的对象 '%s'。未知的镜像参数：%s未知对象类型 %d未知： %s未合并： %s未能识别的选项：'$arg'未能识别的参数：%s未能识别的二进制补丁位于第 %d 行未能识别的包头：%s%s (%d)未能识别的帮助格式 '%s'未能识别的输入未能识别的空白字符忽略选项 '%s'未能识别的空白字符选项 '%s'不支持的索引版本 %s在树中有不支持的对象类型未跟踪的内容, 最新更新尚未诞生的分支，变更添加至索引更新文件失败用法：%s用法：%s%s用 位数字显示 SHA-1 哈希值用掉了超过可用的字节何时当查询： %.*s不会在已查找过的树上二分查找工作区 '%s' 已经存在。您需要先解决当前索引的冲突