Never again accidentally run `commit –amend` in a merge conflict (fish script)gist.github.com1 point·sqwxl··0 commentsOpen articleSaveView on HN