Skip to content

Commit fffb341

Browse files
committed
Bump VERSION to 1.1.2
1 parent c5552a3 commit fffb341

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,7 @@
1212
## 1.1.1 (2021-04-28)
1313

1414
- Fix installation when the attribute file does not exist yet
15+
16+
## 1.1.2 (2021-04-30)
17+
18+
- Implemnt local installation with --install=local

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ This adds necessary settings to your `~/.gitconfig` or
3030
`$XDG_CONFIG_HOME/git/config` and the default gitattributes(5) file to
3131
enable the merge driver for structure.sql files.
3232

33+
If you want to enable this driver only in the current git directory,
34+
run this:
35+
36+
$ git-merge-structure-sql --install=local
37+
3338
## Usage
3439

3540
Once enabled, Git should call this driver as necessary when it needs

lib/git-merge-structure-sql.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#
3434

3535
class StructureSqlMergeDriver
36-
VERSION = '1.1.1'
36+
VERSION = '1.1.2'
3737
VARIANTS = []
3838

3939
module Default # This covers PostgreSQL, SQLite and newer MySQL formats.

0 commit comments

Comments
 (0)