From 0c510f73ff37312a5c8e50c021ad12d179fc80c7 Mon Sep 17 00:00:00 2001
From: Nathan Broadbent <nathan.f77@gmail.com>
Date: Fri, 6 Jan 2012 16:25:42 +0800
Subject: [PATCH] Added alias for git commit -C HEAD (useful at final step of
 merge conflict)

---
 git.scmbrc.example              | 1 +
 lib/git/aliases_and_bindings.sh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/git.scmbrc.example b/git.scmbrc.example
index 06ef34f..1d3d38b 100644
--- a/git.scmbrc.example
+++ b/git.scmbrc.example
@@ -56,6 +56,7 @@ git_add_all_alias="gaa"
 git_commit_all_alias="gca"
 git_commit_amend_alias="gcm"
 git_commit_amend_no_msg_alias="gcmh"
+git_commit_no_msg_alias="gch"
 git_remote_alias="gr"
 git_branch_alias="gb"
 git_branch_all_alias="gba"
diff --git a/lib/git/aliases_and_bindings.sh b/lib/git/aliases_and_bindings.sh
index 8dce54a..9a05f68 100644
--- a/lib/git/aliases_and_bindings.sh
+++ b/lib/git/aliases_and_bindings.sh
@@ -91,6 +91,7 @@ _alias $git_fetch_and_rebase_alias='git fetch && git rebase'
 _alias $git_commit_amend_alias='git commit --amend'
 # 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_no_msg_alias='git commit -C HEAD'
 _alias $git_log_stat_alias='git log --stat --max-count=5'
 _alias $git_log_graph_alias='git log --graph --max-count=5'
 _alias $git_add_all_alias='git add -A'