Commit [b966ce] Maximize Restore History

prepare-commit-msg: Add Gerrit Change-Id to merges

The "git merge" command generates its own commit message and does not
invoke the commit-msg hook. Fortunately it invokes prepare-commit-msg
so teach it to call the gerrit/commit-msg hook for merges.

Suggested-by: Chris Harris <>

Brad King Brad King 2012-02-06

changed prepare-commit-msg
prepare-commit-msg Diff Switch to side-by-side view