Commits

Branch selector

 master

User selector

All users

All time

Commit History

Commits on Feb 6, 2025

• hlint police

  yairchu

  committed
  5ac7e9d

  Copy full SHA for 5ac7e9d

Commits on Nov 25, 2024

• Prep for possible language-aware conflict splitting

  yairchu

  committed
  871889c

  Copy full SHA for 871889c

• Use record update

  yairchu

  committed
  33f49f0

  Copy full SHA for 33f49f0

Commits on Nov 23, 2024

• Fix status for splitted conflicts

  yairchu

  committed
  6527953

  Copy full SHA for 6527953

Commits on Nov 16, 2024

• split-markers enabled by default

  Show description for 5950a47
  yairchu

  committed
  5950a47

  Copy full SHA for 5950a47

Commits on Nov 12, 2024

• Option to auto-resolve indentation changes

  yairchu

  committed
  e04b3a8

  Copy full SHA for e04b3a8

• Update deps

  yairchu

  committed
  846b40f

  Copy full SHA for 846b40f

• Fix warning with GHC 9.8.2

  yairchu

  committed
  9ab03be

  Copy full SHA for 9ab03be

Commits on Sep 20, 2024

• Add GitHub CI

  Show description for c628ed1
  yairchu

  committed
  c628ed1

  Copy full SHA for c628ed1

• Add homebrew badge

  yairchu

  committed
  2ebf154

  Copy full SHA for 2ebf154

• README: add title with hackage icon

  yairchu

  committed
  24e01b4

  Copy full SHA for 24e01b4

• Bump version to 1.1.0 and update changelog

  yairchu

  committed
  354014e

  Copy full SHA for 354014e

• added-lines feature changed to only support safe case when recognize both sides added lines before and after

  yairchu

  committed
  9b245da

  Copy full SHA for 9b245da

Commits on Sep 17, 2024

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

  yairchu

  committed
  9d0a844

  Copy full SHA for 9d0a844

Commits on Aug 24, 2024

• Sort imports

  yairchu

  committed
  e96d6e7

  Copy full SHA for e96d6e7

• Warns about unrecognized options in GIT_MEDIATE_OPTIONS

  yairchu

  committed
  c3e265b

  Copy full SHA for c3e265b

• OptUtils.Parser type alias towards adding state monad

  yairchu

  committed
  088420d

  Copy full SHA for 088420d

• OptUtils interface closer to one that will parse options in state monad and warn on unrecognized options

  yairchu

  committed
  7adf1e8

  Copy full SHA for 7adf1e8

• DRY

  yairchu

  committed
  36d197c

  Copy full SHA for 36d197c

• Fix help for switches initialized from env

  yairchu

  committed
  a93628e

  Copy full SHA for a93628e

• DRY reuse envOption

  yairchu

  committed
  2dcfbd4

  Copy full SHA for 2dcfbd4

• Style: prefer guards on if

  yairchu

  committed
  c07e919

  Copy full SHA for c07e919

• DRY

  yairchu

  committed
  be2217c

  Copy full SHA for be2217c

Commits on Aug 23, 2024

• A few comments

  yairchu

  committed
  3b80db4

  Copy full SHA for 3b80db4

• Warn on duplicate flags in GIT_MEDIATE_OPTIONS

  yairchu

  committed
  25dd411

  Copy full SHA for 25dd411

• Extract options available to GIT_MEDIATE_OPTIONS to separate data type

  yairchu

  committed
  9b292e7

  Copy full SHA for 9b292e7

Commits on Aug 22, 2024

• GIT_MEDIATE_OPTIONS properly parses -U

  yairchu

  committed
  295d281

  Copy full SHA for 295d281

Commits on Aug 20, 2024

• EnvContent.remainder field towards error messages for unrecognized flags

  yairchu

  committed
  c133269

  Copy full SHA for c133269

• Extract EnvContent from EnvOptions, has Monoid instance

  yairchu

  committed
  5ab4285

  Copy full SHA for 5ab4285

Commits on Aug 18, 2024

• Context flag env opts support

  yairchu

  committed
  c0aa05e

  Copy full SHA for c0aa05e

Commits on Aug 13, 2024

• Add missing optional combinator for --untabify

  yairchu

  committed
  d56d8c9

  Copy full SHA for d56d8c9

• Oops envSwitch parsed value was wrong.

  Show description for 9f7f7c4
  yairchu

  committed
  9f7f7c4

  Copy full SHA for 9f7f7c4

• --editor better supports xed/Xcode (open in line)

  yairchu

  committed
  ad060bd

  Copy full SHA for ad060bd

Commits on Aug 12, 2024

• GIT_MEDIATE_OPTIONS supports untabify too

  Show description for 20b3277
  yairchu

  committed
  20b3277

  Copy full SHA for 20b3277

• Initial GIT_MEDIATE_OPTIONS environment variable support

  yairchu

  committed
  282dbc7

  Copy full SHA for 282dbc7