| #!/bin/sh | |
| # Use socat to proxy git through an HTTP CONNECT firewall. | |
| # Useful if you are trying to clone git:// from inside a company. | |
| # Requires that the proxy allows CONNECT to port 9418. | |
| # | |
| # Save this file as gitproxy somewhere in your path (e.g., ~/bin) and then run | |
| # chmod +x gitproxy | |
| # git config --global core.gitproxy gitproxy | |
| # | |
| # More details at http://tinyurl.com/8xvpny |
FileMerge (opendiff) can really come in handy when you need to visually compare merging conflicts. Other times it's just a nice visual way to review your days work.
The following method works by creating a simple bash script (git-diff-cmd.sh) that sets us up with the proper command line arguments for Git to pass off files to FileMerge.
| set nocompatible | |
| source $VIMRUNTIME/vimrc_example.vim | |
| source $VIMRUNTIME/mswin.vim | |
| behave mswin | |
| syntax on | |
| filetype plugin on | |
| "about tab | |
| set autoindent |
| #!/bin/sh | |
| # Change this line to the URI path of the xcode DMG file. | |
| # XCode 3.2.5 | |
| #XCODE_PATH="/ios/ios_sdk_4.2__final/xcode_3.2.5_and_ios_sdk_4.2_final.dmg" | |
| # XCode 4 | |
| #XCODE_PATH="/Developer_Tools/xcode_4_and_ios_sdk_4.3__final/xcode_4_and_ios_sdk_4.3__final.dmg" |
| 原帖地址: http://topic.csdn.net/u/20110113/19/b0d5d506-4307-428b-a61d-7974aa66a2da.html | |
| 首先要说明的是：这里介绍的方法都是大部分是本人“悟”出来的，所以网上难有流传！ | |
| 好方法不能自己私藏，否则就白忙乎这几天了，分享给有需要的朋友们。如果有转载，敬请注明来自*CSDN老邓*作品。 | |
| 呵呵，给自己打广告，实在是无耻之极，权当无聊之时打字之用。 | |
| 欢迎流传，为最优秀的分布式版本管理系统Git做宣传！！ | |
| 步骤： | |
| 1. 下载：http://loaden.googlecode.com/files/gitconfig.7z | |
| 2. 解压到：<MsysGit安装目录>/cmd/，例如：D:\Program Files\Git\cmd |
| #!/bin/sh | |
| # Just copy and paste the lines below (all at once, it won't work line by line!) | |
| # MAKE SURE YOU ARE HAPPY WITH WHAT IT DOES FIRST! THERE IS NO WARRANTY! | |
| function abort { | |
| echo "$1" | |
| exit 1 | |
| } | |
| set -e |
| [Solarized Dark] | |
| text(bold)=839496 | |
| magenta(bold)=6c71c4 | |
| text=839496 | |
| white(bold)=fdf6e3 | |
| green=859900 | |
| red(bold)=cb4b16 | |
| green(bold)=586e75 | |
| black(bold)=073642 | |
| red=dc322f |
| #!/bin/bash | |
| for arg; do [[ $arg = /* ]] || arg=$PWD/$arg; absargs+=("$arg"); done; | |
| /Applications/P4Merge.app/Contents/Resources/launchp4merge "${absargs[@]}" | |
An introduction to curl using GitHub's API.
Makes a basic GET request to the specifed URI
curl https://api.github.com/users/caspyin
| body { | |
| font-family: Helvetica, arial, sans-serif; | |
| font-size: 14px; | |
| line-height: 1.6; | |
| padding-top: 10px; | |
| padding-bottom: 10px; | |
| background-color: white; | |
| padding: 30px; } | |
| body > *:first-child { |