Skip to content

Activity

hlint police

yairchupushed 1 commit to master • 871889c…5ac7e9d • 
10 days ago

Prep for possible language-aware conflict splitting

yairchupushed 1 commit to master • 33f49f0…871889c • 
on Nov 25, 2024

Use record update

yairchupushed 1 commit to master • 6527953…33f49f0 • 
on Nov 25, 2024

Fix status for splitted conflicts

yairchupushed 1 commit to master • 5950a47…6527953 • 
on Nov 23, 2024

split-markers enabled by default

yairchupushed 1 commit to master • e04b3a8…5950a47 • 
on Nov 16, 2024

Option to auto-resolve indentation changes

yairchupushed 3 commits to master • c628ed1…e04b3a8 • 
on Nov 12, 2024

Deleted branch

yairchudeleted fix-build • 
on Sep 23, 2024

Deleted tag

yairchudeleted refs/tags/1.1.0.1 • 
on Sep 23, 2024

Deleted tag

yairchudeleted refs/tags/1.1.0.1rc0 • 
on Sep 23, 2024

Attempt to fix stack build failure in brew CI

yairchucreated fix-build • 635a0cf • 
on Sep 23, 2024

Deleted branch

yairchudeleted ci • 
on Sep 21, 2024

Add GitHub CI

Force push
yairchuforce pushed to ci • 15016d8…c628ed1 • 
on Sep 21, 2024

Add GitHub CI

yairchupushed 1 commit to master • 2ebf154…c628ed1 • 
on Sep 20, 2024

Add GitHub CI

yairchucreated ci • 15016d8 • 
on Sep 20, 2024

Add homebrew badge

yairchupushed 1 commit to master • 24e01b4…2ebf154 • 
on Sep 20, 2024

README: add title with hackage icon

yairchupushed 1 commit to master • 354014e…24e01b4 • 
on Sep 20, 2024

Bump version to 1.1.0 and update changelog

yairchupushed 1 commit to master • 9b245da…354014e • 
on Sep 20, 2024

added-lines feature changed to only support safe case when recognize …

yairchupushed 1 commit to master • 9d0a844…9b245da • 
on Sep 20, 2024

New option --split-markers (fix #52)

yairchupushed 1 commit to master • e96d6e7…9d0a844 • 
on Sep 17, 2024

Use lens (unnecessary?)

Force push
yairchuforce pushed to lens • 86a777f…9eab13a • 
on Aug 24, 2024

Sort imports

yairchupushed 2 commits to master • 088420d…e96d6e7 • 
on Aug 24, 2024

Warns about unrecognized options in GIT_MEDIATE_OPTIONS, see note

Force push
yairchuforce pushed to lens • 4e8c1f9…86a777f • 
on Aug 24, 2024

OptUtils.Parser type alias towards adding state monad

yairchupushed 1 commit to master • 7adf1e8…088420d • 
on Aug 24, 2024

Warns about unrecognized options in GIT_MEDIATE_OPTIONS, see note

Force push
yairchuforce pushed to lens • e9585a0…4e8c1f9 • 
on Aug 24, 2024

OptUtils interface closer to one that will parse options in state mon…

yairchupushed 1 commit to master • 36d197c…7adf1e8 • 
on Aug 24, 2024

Warns about unrecognized options in GIT_MEDIATE_OPTIONS, see note

Force push
yairchuforce pushed to lens • a2f6883…e9585a0 • 
on Aug 24, 2024

DRY

yairchupushed 1 commit to master • a93628e…36d197c • 
on Aug 24, 2024

Warns about unrecognized options in GIT_MEDIATE_OPTIONS, see note

Force push
yairchuforce pushed to lens • a84dcce…a2f6883 • 
on Aug 24, 2024

Fix help for switches initialized from env

yairchupushed 1 commit to master • 2dcfbd4…a93628e • 
on Aug 24, 2024

DRY reuse envOption

yairchupushed 1 commit to master • c07e919…2dcfbd4 • 
on Aug 24, 2024