This sheet goes along with this SSH YouTube tutorial
$ ssh [email protected]
$ mkdir test
$ cd test
$ ssh [email protected]
$ mkdir test
$ cd test
| [merge] | |
| keepBackup = false | |
| tool = custom | |
| [mergetool "custom"] | |
| cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "$PWD/$BASE" "$PWD/$REMOTE" "$PWD/$LOCAL" "$PWD/$MERGED" | |
| keepTemporaries = false | |
| trustExitCode = false | |
| keepBackup = false |
| # put this in your .bash_profile | |
| if [ $ITERM_SESSION_ID ]; then | |
| export PROMPT_COMMAND='echo -ne "\033];${PWD##*/}\007"; ':"$PROMPT_COMMAND"; | |
| fi | |
| # Piece-by-Piece Explanation: | |
| # the if condition makes sure we only screw with $PROMPT_COMMAND if we're in an iTerm environment | |
| # iTerm happens to give each session a unique $ITERM_SESSION_ID we can use, $ITERM_PROFILE is an option too | |
| # the $PROMPT_COMMAND environment variable is executed every time a command is run | |
| # see: ss64.com/bash/syntax-prompt.html |
| # If you work with git, you've probably had that nagging sensation of not knowing what branch you are on. Worry no longer! | |
| export PS1="\\w:\$(git branch 2>/dev/null | grep '^*' | colrm 1 2)\$ " | |
| # This will change your prompt to display not only your working directory but also your current git branch, if you have one. Pretty nifty! | |
| # ~/code/web:beta_directory$ git checkout master | |
| # Switched to branch "master" | |
| # ~/code/web:master$ git checkout beta_directory | |
| # Switched to branch "beta_directory" |
| #!/bin/sh | |
| if [ $# != 2 ]; then | |
| echo "\nchris k's git update automater sh script. Edit to put a bunch of \`git add blah'" | |
| echo "lines in the body then evoke with the branch name and commit description\n" | |
| echo "Usage: $0 <branch_name> <\"Description of update\">\n" | |
| echo " branch_name: the name of the git branch to be created" | |
| echo " Description: Text for: git commit -m \"Description of update\"" | |
| echo "" | |
| echo "Example:" | |
| BRANCH="core_override" |