create different ssh key according the article Mac Set-Up Git
$ ssh-keygen -t rsa -C "[email protected]"
# 0 is too far from ` ;) | |
set -g base-index 1 | |
# Automatically set window title | |
set-window-option -g automatic-rename on | |
set-option -g set-titles on | |
#set -g default-terminal screen-256color | |
set -g status-keys vi | |
set -g history-limit 10000 |
class Api::RegistrationsController < Api::BaseController | |
respond_to :json | |
def create | |
user = User.new(params[:user]) | |
if user.save | |
render :json=> user.as_json(:auth_token=>user.authentication_token, :email=>user.email), :status=>201 | |
return | |
else |
;; This are setting for nice tabbar items | |
;; to have an idea of what it looks like http://imgur.com/b0SNN | |
;; inspired by Amit Patel screenshot http://www.emacswiki.org/pics/static/NyanModeWithCustomBackground.png | |
;; Tabbar | |
(require 'tabbar) | |
;; Tabbar settings | |
(set-face-attribute | |
'tabbar-default nil | |
:background "gray20" |
create different ssh key according the article Mac Set-Up Git
$ ssh-keygen -t rsa -C "[email protected]"
Use magit-ediff or 'e' on an unmerged item to resolve merge conflicts with ediff. Magit will set up an ediff with three buffers A, B and C. A and B are the original (conflicting) files, and C is the conflicted merge.
Use 'n'/'p' to move to the next/previous conflict, use 'a'/'b' to choose which changes (those in a A or B) should be the ones to keep in the merged file.
You can always just switch to buffer C and edit what the merged version should look like.
!! Appearance | |
urxvt.termName: rxvt-unicode | |
urxvt.scrollBar: false | |
urxvt.background: black | |
urxvt.foreground: gray | |
!! Font prefferenes | |
urxvt.font: xft:DejaVu Sans Mono:pixelsize=13 | |
urxvt.boldFont: xft:DejaVu Sans Mono:pixelsize=13:weight=bold | |
urxvt.letterSpace: -1 | |
!! Larger history limit |
# असारको माया | |
यो माया भन्ने चिज कस्तो | |
गर्मीमा घाम नलागेको जस्तो | |
लोडसेडीगमा tube-lite बाल्या जस्तो॥ | |
यतिमात्र होईन, कि कसो, | |
गाईको दुध पनि कस्तो सस्तो | |
ncell को sim-card लिए जस्तो |