Skip to content

Instantly share code, notes, and snippets.

@masak

masak/git-edit-commit

Created June 11, 2014 11:51
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save masak/644702118d2798e890de to your computer and use it in GitHub Desktop.
Save masak/644702118d2798e890de to your computer and use it in GitHub Desktop.
Download ZIP
A git-edit-commit subcommand
Raw
git-edit-commit
COMMIT="$1"
echo "${COMMIT:=HEAD}"
OLD_HEAD=`git rev-parse HEAD`
git reset --hard $COMMIT
git reset --mixed HEAD~
git commit --patch || (git reset --hard $OLD_HEAD && exit)
git checkout .
git rebase -X theirs $OLD_HEAD
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment