Browse Source

Add `reset` git aliases and iTerm windows positions.

master
Nick Plekhanov 9 years ago
parent
commit
fec82b4a83
  1. 9
      git/gitconfig
  2. 8
      iterm/com.googlecode.iterm2.plist

9
git/gitconfig

@ -30,10 +30,10 @@
l = log --pretty=custom # Show custom log
ll = log --stat --abbrev-commit
lc = shortlog --summary --numbered # List contributors
rlc = reset --hard HEAD~1 # Remove last commit
ulc = reset --soft HEAD~1 # Undo last commit
rlc = reset --hard HEAD~1 # Remove last commit (from HEAD, Index and Working Dir)
undo = reset --soft HEAD~1 # Undo last commit (affects HEAD only)
unstage = reset HEAD
unstage = reset HEAD -- # Mixed reset (affects HEAD and Index)
publish = "!git push --set-upstream origin $(git branch-name)"
branch-name = rev-parse --abbrev-ref HEAD
@ -206,3 +206,6 @@
clean = git lfs clean %f
smudge = git lfs smudge %f
required = true
[user]
name = Nick Plekhanov
email = nickatgit@yandex.com

8
iterm/com.googlecode.iterm2.plist

@ -5716,7 +5716,7 @@
<key>FocusFollowsMouse</key>
<false/>
<key>FsTabDelay</key>
<real>1</real>
<real>0.41258138418197632</real>
<key>HiddenAFRStrokeThickness</key>
<real>0.0</real>
<key>HiddenAdvancedFontRendering</key>
@ -5798,7 +5798,7 @@
<key>NSWindow Frame Preferences</key>
<string>458 289 924 485 0 0 1440 877 </string>
<key>NSWindow Frame iTerm Window 0</key>
<string>4 49 1432 826 0 0 1440 877 </string>
<string>0 0 1440 878 0 0 1440 877 </string>
<key>New Bookmarks</key>
<array>
<dict>
@ -6530,7 +6530,7 @@
<key>NoSyncTimeOfLastPromo</key>
<real>479497009.48278099</real>
<key>NoSyncTimeOfLastPromoDownload</key>
<real>481839465.66615897</real>
<real>482102576.85914099</real>
<key>OnlyWhenMoreTabs</key>
<true/>
<key>OpenArrangementAtStartup</key>
@ -6593,7 +6593,7 @@
<key>SUHasLaunchedBefore</key>
<true/>
<key>SULastCheckTime</key>
<date>2016-04-08T20:17:41Z</date>
<date>2016-04-11T21:22:38Z</date>
<key>SavePasteHistory</key>
<false/>
<key>ShowBookmarkName</key>

Loading…
Cancel
Save