flo/scm_breeze
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added alias for git commit -C HEAD (useful at final step of merge conflict)

Browse Source
This commit is contained in:
Nathan Broadbent
2012-01-06 16:25:42 +08:00
parent a78577d613
commit 0c510f73ff
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
git.scmbrc.example
View File

@@ -56,6 +56,7 @@ git_add_all_alias="gaa"
git_commit_all_alias="gca" git_commit_all_alias="gca"
git_commit_amend_alias="gcm" git_commit_amend_alias="gcm"
git_commit_amend_no_msg_alias="gcmh" git_commit_amend_no_msg_alias="gcmh"
git_commit_no_msg_alias="gch"
git_remote_alias="gr" git_remote_alias="gr"
git_branch_alias="gb" git_branch_alias="gb"
git_branch_all_alias="gba" git_branch_all_alias="gba"

1
lib/git/aliases_and_bindings.sh
View File

@@ -91,6 +91,7 @@ _alias $git_fetch_and_rebase_alias='git fetch && git rebase'
_alias $git_commit_amend_alias='git commit --amend' _alias $git_commit_amend_alias='git commit --amend'
# Add staged changes to latest commit without prompting for message # Add staged changes to latest commit without prompting for message
_alias $git_commit_amend_no_msg_alias='git commit --amend -C HEAD' _alias $git_commit_amend_no_msg_alias='git commit --amend -C HEAD'
_alias $git_commit_no_msg_alias='git commit -C HEAD'
_alias $git_log_stat_alias='git log --stat --max-count=5' _alias $git_log_stat_alias='git log --stat --max-count=5'
_alias $git_log_graph_alias='git log --graph --max-count=5' _alias $git_log_graph_alias='git log --graph --max-count=5'
_alias $git_add_all_alias='git add -A' _alias $git_add_all_alias='git add -A'