使用GIT进行merge的时候, git merge --no-ff master 如果merge之后出现问题, 想进行回退, 可以使用 git reset --hard HEAD 来回退到最新的版本, 这时使用git status 可能出现 Untrack file $ git status On branch fds_encrypt_conf Your branch is up-to-date with 'origin/fds_encrypt_conf'. Untracked files:…
Sorting File Contents and Output with sort Another very useful command to use on text file is sort . As you can probably guess, this command sorts text. If you type sort /etc/passwd , for instance, the content of the /etc/passwd file is sorted i…
/*弹窗购买蛋糕*/;(function(){ var $DialogBg=$(".Dialogbg-Select"); var $Dialog=$(".Dialog-Select"); var $close=$(".s-closes"); function goBuy(els,opts,disArr,dis) { this.$els = $(els); this.$add = this.$els.find(opts.add); this.$re…
git status: git status命令的输出十分详细,但其用语有些繁琐. 如果你使用 git status -s 命令或 git status --short 命令,你将得到一种更为紧凑的格式输出: $ git status -s M README MM Rakefile A lib/git.rb M lib/simplegit.rb ?? LICENSE.txt ??:新添加,未跟踪 右M:被修改,未放入暂存区 左M:被修改,放入暂存区 A:新添加,放入暂存区 git status…
private void AddFileToDocumentLibrary(string documentLibraryUrl, string filename, byte[] file_bytes, string itemTitleText) { SPSecurity.RunWithElevatedPrivileges(delegate() { using (SPSite site = new SPSite(documentLibraryUrl)) { using (SPWeb web = s…
By default, -l option will search libraries with lib* prefix in speficied search paths. i.e. 1 ld -o a.out -lA cppmain.o will search libA.so/libA.a in all library search paths. but it is possbile to set library by using a path & any filename(without…
在执行命令 git commit --all -m '说明' 时报错“The file will have its original line endings in your working directory” 通过查询后发现出现这个问题主要原因是: 我们从别人github地址上通过git clone下载下来,而又想git push到我们自己的github上,那么就会出现上面提示的错误信息 此时只需要执行如下代码: git rm -r --cached . git config core.a…