diff options
| author | Hugues Hiegel <hugues.hiegel@qosmos.com> | 2014-01-24 12:39:58 +0100 |
|---|---|---|
| committer | Hugues Hiegel <hugues.hiegel@qosmos.com> | 2014-01-24 12:39:58 +0100 |
| commit | 1040af12c70ffd923e4dd1989a660c26e91e103e (patch) | |
| tree | ba064831e575ad8e3faa11fb78d24df113202ce9 /user:hugues/Aliases.zsh | |
| parent | b68e23cd00915e94389fbe5f56508113655a1880 (diff) | |
| parent | a619da8a796876ac62857f54f41f444e2e12d087 (diff) | |
Merge branch 'master' into HackyGit
Diffstat (limited to 'user:hugues/Aliases.zsh')
| -rw-r--r-- | user:hugues/Aliases.zsh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/user:hugues/Aliases.zsh b/user:hugues/Aliases.zsh index 435daa9..4a2322b 100644 --- a/user:hugues/Aliases.zsh +++ b/user:hugues/Aliases.zsh @@ -72,6 +72,9 @@ a lc='ls -c' a l1='\ls -1' a gitk='\gitk --date-order' +a gm='\git mergetool' +a grc='\git rebase --continue' +a gra='\git rebase --abort' __cmd_exists dict && a definition='dict -h dict.org' __cmd_exists dict && a traduction='dict -h hiegel.fr -P-' |