Git 比较不同版本文件差异的常用命令格式:
git diff 查看尚未暂存的文件更新了哪些部分
git diff filename 查看尚未暂存的某个文件更新了哪些
git diff –cached 查看已经暂存起来的文件和上次提交的版本之间的差异
git diff –cached filename 查看已经暂存起来的某个文件和上次提交的版本之间的差异
| import os | |
| import ycm_core | |
| from clang_helpers import PrepareClangFlags | |
| # Set this to the absolute path to the folder (NOT the file!) containing the | |
| # compile_commands.json file to use that instead of 'flags'. See here for | |
| # more details: http://clang.llvm.org/docs/JSONCompilationDatabase.html | |
| # Most projects will NOT need to set this to anything; you can just change the | |
| # 'flags' list of compilation flags. Notice that YCM itself uses that approach. | |
| compilation_database_folder = '' |
| package main | |
| import ( | |
| "fmt" | |
| "log" | |
| "os" | |
| "strings" | |
| "github.com/aws/aws-sdk-go/aws" | |
| "github.com/aws/aws-sdk-go/aws/credentials" |
Git 比较不同版本文件差异的常用命令格式:
git diff 查看尚未暂存的文件更新了哪些部分
git diff filename 查看尚未暂存的某个文件更新了哪些
git diff –cached 查看已经暂存起来的文件和上次提交的版本之间的差异
git diff –cached filename 查看已经暂存起来的某个文件和上次提交的版本之间的差异
| set filelink=%1 | |
| set filecolor=%1.png | |
| ffmpeg -i %filelink% -r 24 -vf fps=24,scale=240:-1:flags=lanczos,palettegen -y %filecolor% && ffmpeg -v warning -i %filelink% -i %filecolor% -r 4 -lavfi fps=24,scale=240:-1:flags=lanczos[x];[x][1:v]paletteuse -y %filelink%.gif && del /F /S /Q %filecolor% | |
| exit |
| " Statusline (requires Powerline font) | |
| set statusline= | |
| set statusline+=%(%{&buflisted?bufnr('%'):''}\ \ %) | |
| set statusline+=%< " Truncate line here | |
| set statusline+=%f\ " File path, as typed or relative to current directory | |
| set statusline+=%{&modified?'+\ ':''} | |
| set statusline+=%{&readonly?'\ ':''} | |
| set statusline+=%= " Separation point between left and right aligned items | |
| set statusline+=\ %{&filetype!=#''?&filetype:'none'} | |
| set statusline+=%(\ %{(&bomb\|\|&fileencoding!~#'^$\\\|utf-8'?'\ '.&fileencoding.(&bomb?'-bom':''):'') |
| #!/bin/bash | |
| if [ $# -ne 2 ];then | |
| echo "Usage:$0 dir1 dir2" | |
| exit 1 | |
| fi | |
| if [ ! -d $1 -o ! -d $2 ];then | |
| echo "$1 or $2 is not derectory!" | |
| exit 1 | |
| fi |
| set noautofocus | |
| let searchlimit = 42 | |
| let scrollstep = 175 | |
| map y yankDocumentUrl | |
| map a createBookmark | |
| map d closeTab | |
| map D closeTabsToRight | |
| map X closeTabsToLeft | |
| map u lastClosedTab | |
| map h goBack |