jjkiers/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Git: conflicts alias.

Browse Source
This commit is contained in:
Artem Sapegin 2012-12-13 16:27:12 +04:00
parent 38359da2f6
commit ab3cb53a00
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/Git.md
View File

@ -48,6 +48,10 @@ Add all staged files to previous commit.
Undo last commit withould loosing any changes. Undo last commit withould loosing any changes.
### git conflicts
List of files with unresolved conflicts.
### gr ### gr
Jump to root folder of Git repo. Jump to root folder of Git repo.

1
tilde/gitconfig
View File

@ -31,6 +31,7 @@
this = !git init && git add . && git commit -m \"Initial commit.\" this = !git init && git add . && git commit -m \"Initial commit.\"
append = !git log -n 1 --pretty=tformat:%s%n%n%b | git commit -F - --amend append = !git log -n 1 --pretty=tformat:%s%n%n%b | git commit -F - --amend
undo = reset --mixed HEAD^ undo = reset --mixed HEAD^
conflicts = !git ls-files -u | awk '{print $4}' | sort -u
[push] [push]
default = current default = current