f-karagoz · February 1, 2023 23:34 · Aug 28, 2015 · Mar 13, 2014 · Mar 13, 2014 · Mar 13, 2014
diff --git a/.gitconfig b/.gitconfig
@@ -1,10 +1,14 @@
 [alias]
   a = add
   aa = add -A
+  ac = "!f() { curl $@ | git apply --index; }; f"
+  ac3 = "!f() { curl $@ | git apply -3 --index; }; f"
   amend = commit --amend -C HEAD
   ap = add -p
+  app = apply --index
   br = branch
   cb = checkout -b
+  cc = !git rh core && git co core && git clean -fd core
   ci = commit
   cim = commit -m
   cl = clone
@@ -14,30 +18,43 @@
   dh = diff HEAD
   dic = diff --cached
   go = checkout
-  pom = push origin master
+  ol = log --oneline
+  p = format-patch --stdout
+  pg = "!f() { push origin $1:refs/for/$2; }; f"
+  pl = pull
   plom = pull origin master
+  pom = push origin master
+  pomp = push origin master:preprod
+  poml = push origin master:prod
   poa = push origin --all
   rb = rebase
   rh = reset HEAD
   sl = stash list
   sp = stash pop
   ss = stash save
-  st = status -s
+  st = status
 
   ignore = update-index --assume-unchanged
   unignore = update-index --no-assume-unchanged
   ignored = !git ls-files -v | grep '^h'
 
   who = shortlog -sne
-  graph = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an$
+  graph = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
 [color]
   ui = true
 [core]
-  autocrlf = true
-  excludesfile = ~/.gitignore_global
+  autocrlf = false
+  safecrlf = false
   ignorecase = false
+  excludesfile = ~/.gitignore
 [branch]
   autosetuprebase = always
 [diff]
   renames = copies
-  algorithm = patience
+  algorithm = patience
+[push]
+  default = simple
+[merge "theirs"]
+  driver = true
+[diff "nodiff"]
+	command = /bin/true
diff --git a/.gitignore_global b/.gitignore_global
@@ -16,12 +16,28 @@
 .Spotlight-V100
 .Trashes
 ehthumbs.db
+
+### Windows junk files
 [Tt]humbs.db
+*.lnk
 
+### Patch/diff artifacts.
+*.patch
+*.diff
+*.orig
+*.rej
+interdiff*.txt
 
 ### Other SCM
 .svn
 
+### emacs artifacts.
+*~
+\#*\#
+
+### VI swap file
+*.swp
+
 ### phpStorm
 .idea
 
@@ -32,3 +48,6 @@ ehthumbs.db
 
 ### Netbeans
 nbproject
+
+## Sass Maps
+*.css.map
diff --git a/.gitconfig b/.gitconfig
@@ -34,6 +34,7 @@
   ui = true
 [core]
   autocrlf = true
+  excludesfile = ~/.gitignore_global
   ignorecase = false
 [branch]
   autosetuprebase = always

diff --git a/.gitignore → .gitignore_global b/.gitignore → .gitignore_global
diff --git a/.gitignore b/.gitignore
@@ -4,11 +4,21 @@
 *.swp
 *.out
 *.patch
+*.log
+*.sql
+*.sqlite
 
 ### OS junk files
+.DS_Store
+.DS_Store?
 *.DS_Store
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
 [Tt]humbs.db
 
+
 ### Other SCM
 .svn
 

diff --git a/.gitconfig b/.gitconfig
@@ -1,22 +1,28 @@
 [alias]
-  amend = commit --amend -C HEAD
   a = add
   aa = add -A
+  amend = commit --amend -C HEAD
   ap = add -p
   br = branch
   cb = checkout -b
   ci = commit
   cim = commit -m
+  cl = clone
   co = checkout
-  go = checkout
+  cp = cherry-pick
   df = diff
-  dic = diff --cached
   dh = diff HEAD
+  dic = diff --cached
+  go = checkout
   pom = push origin master
   plom = pull origin master
   poa = push origin --all
+  rb = rebase
   rh = reset HEAD
-  st = status
+  sl = stash list
+  sp = stash pop
+  ss = stash save
+  st = status -s
 
   ignore = update-index --assume-unchanged
   unignore = update-index --no-assume-unchanged

diff --git a/.gitconfig b/.gitconfig
@@ -3,7 +3,6 @@
   a = add
   aa = add -A
   ap = add -p
-  ar = !git add -A . && git reset HEAD .
   br = branch
   cb = checkout -b
   ci = commit
@@ -24,18 +23,14 @@
   ignored = !git ls-files -v | grep '^h'
 
   who = shortlog -sne
-  graph = log --pretty=oneline --abbrev-commit --graph
+  graph = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an$
 [color]
   ui = true
 [core]
   autocrlf = true
   ignorecase = false
-  excludesfile = ~/.gitignore
 [branch]
   autosetuprebase = always
 [diff]
   renames = copies
-  algorithm = patience
-[user]
-  name = Your name here
-  email = your@mail.com
+  algorithm = patience
diff --git a/.gitignore b/.gitignore
@@ -1,24 +1,24 @@
-# Generic files to ignore
+### Generic files to ignore
 *~
 *.lock
 *.swp
 *.out
 *.patch
 
-# OS junk files
+### OS junk files
 *.DS_Store
 [Tt]humbs.db
 
-# Other SCM
+### Other SCM
 .svn
 
-# phpStorm
+### phpStorm
 .idea
 
-# Eclipse based
+### Eclipse based
 .buildpath
 .settings
 .project
 
-# Netbeans
+### Netbeans
 nbproject
diff --git a/.gitconfig b/.gitconfig
@@ -30,8 +30,12 @@
 [core]
   autocrlf = true
   ignorecase = false
+  excludesfile = ~/.gitignore
 [branch]
   autosetuprebase = always
 [diff]
   renames = copies
-  algorithm = patience
+  algorithm = patience
+[user]
+  name = Your name here
+  email = your@mail.com
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,24 @@
+# Generic files to ignore
+*~
+*.lock
+*.swp
+*.out
+*.patch
+
+# OS junk files
+*.DS_Store
+[Tt]humbs.db
+
+# Other SCM
+.svn
+
+# phpStorm
+.idea
+
+# Eclipse based
+.buildpath
+.settings
+.project
+
+# Netbeans
+nbproject
diff --git a/.gitconfig b/.gitconfig
@@ -3,6 +3,7 @@
   a = add
   aa = add -A
   ap = add -p
+  ar = !git add -A . && git reset HEAD .
   br = branch
   cb = checkout -b
   ci = commit
@@ -33,4 +34,4 @@
   autosetuprebase = always
 [diff]
   renames = copies
-  algorithm = patience
+  algorithm = patience
diff --git a/.gitconfig b/.gitconfig
@@ -0,0 +1,36 @@
+[alias]
+  amend = commit --amend -C HEAD
+  a = add
+  aa = add -A
+  ap = add -p
+  br = branch
+  cb = checkout -b
+  ci = commit
+  cim = commit -m
+  co = checkout
+  go = checkout
+  df = diff
+  dic = diff --cached
+  dh = diff HEAD
+  pom = push origin master
+  plom = pull origin master
+  poa = push origin --all
+  rh = reset HEAD
+  st = status
+
+  ignore = update-index --assume-unchanged
+  unignore = update-index --no-assume-unchanged
+  ignored = !git ls-files -v | grep '^h'
+
+  who = shortlog -sne
+  graph = log --pretty=oneline --abbrev-commit --graph
+[color]
+  ui = true
+[core]
+  autocrlf = true
+  ignorecase = false
+[branch]
+  autosetuprebase = always
+[diff]
+  renames = copies
+  algorithm = patience
No results found