tvd-git 0.0.11 → 0.0.12
Sign up to get free protection for your applications and to get access to all the features.
|
@@ -2,8 +2,15 @@
|
|
|
2
2
|
editor = vim
|
|
3
3
|
|
|
4
4
|
[diff]
|
|
5
|
+
tool = vimdiff
|
|
5
6
|
external = <%= node[:git][:diff_external] %>
|
|
6
7
|
|
|
8
|
+
[difftool]
|
|
9
|
+
prompt = false
|
|
10
|
+
|
|
11
|
+
[mergetool]
|
|
12
|
+
prompt = false
|
|
13
|
+
|
|
7
14
|
[pager]
|
|
8
15
|
diff =
|
|
9
16
|
|
|
@@ -13,6 +20,8 @@
|
|
|
13
20
|
[alias]
|
|
14
21
|
lg = log --oneline --name-status --decorate --graph
|
|
15
22
|
serve = !git daemon --reuseaddr --verbose --base-path=. --export-all ./.git
|
|
23
|
+
d = difftool
|
|
24
|
+
m = mergetool
|
|
16
25
|
|
|
17
26
|
[color]
|
|
18
27
|
ui = true
|
metadata
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: tvd-git
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
hash:
|
|
4
|
+
hash: 7
|
|
5
5
|
prerelease:
|
|
6
6
|
segments:
|
|
7
7
|
- 0
|
|
8
8
|
- 0
|
|
9
|
-
-
|
|
10
|
-
version: 0.0.
|
|
9
|
+
- 12
|
|
10
|
+
version: 0.0.12
|
|
11
11
|
platform: ruby
|
|
12
12
|
authors:
|
|
13
13
|
- Tom Bombadil
|
|
@@ -15,7 +15,7 @@ autorequire:
|
|
|
15
15
|
bindir: bin
|
|
16
16
|
cert_chain: []
|
|
17
17
|
|
|
18
|
-
date: 2012-04-
|
|
18
|
+
date: 2012-04-12 00:00:00 Z
|
|
19
19
|
dependencies:
|
|
20
20
|
- !ruby/object:Gem::Dependency
|
|
21
21
|
name: microwave
|