summaryrefslogtreecommitdiff
path: root/Command/Merge.hs
Commit message (Expand)AuthorAge
* doh't use "def" for command definitions, it conflicts with Data.Default.defGravatar Joey Hess2014-10-14
* fix inversion of control in CommandSeek (no behavior changes)Gravatar Joey Hess2014-01-20
* sync: Work even when the local git repository is new and empty, with no maste...Gravatar Joey Hess2013-11-02
* sync: Don't fail if the directory it is run in gets removed by the sync.Gravatar Joey Hess2013-09-13
* merge: Now also merges synced/master or similar branches, which makes it use...Gravatar Joey Hess2013-07-03
* add section metadata to all commandsGravatar Joey Hess2013-03-24
* improve alwayscommit=false modeGravatar Joey Hess2012-02-25
* clean up check selection codeGravatar Joey Hess2011-10-29
* Fail if --from or --to is passed to commands that do not support them.Gravatar Joey Hess2011-10-27
* refactored and generalized pre-command sanity checkingGravatar Joey Hess2011-10-27
* renameGravatar Joey Hess2011-10-05
* renameGravatar Joey Hess2011-10-04
* factor out common importsGravatar Joey Hess2011-10-03
* remove command type definitionsGravatar Joey Hess2011-09-15
* shorten synopsisGravatar Joey Hess2011-09-14
* add merge subcommandGravatar Joey Hess2011-06-22
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-30 03:57:19 +0000