repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff
2009-04-08
Dav
i
d Ag
u
i
l
a
r
d
ifftool: remove merge optio
n
s for op
e
ndiff,
tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
every
d
ay: use the da
s
hless
f
orm o
f
gi
t
-
i
n
it
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
Davi
d
Aguil
a
r
c
o
n
t
rib/difftool: u
s
e a sep
a
r
a
t
e c
o
nfig namesp
a
c
e for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David
Aguila
r
co
n
trib/difftool: D
o
n't rep
e
at merge tool candida
t
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David
A
gu
i
lar
diff
t
ool: put the
c
ursor on the editable
f
i
le
f
o
r Vi
m
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool:
f
i
x d
o
cumentation
pr
o
ble
m
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
contr
i
b
:
a
dd 'git
difftool' f
o
r launching common
m
e
r
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
D
avid Agu
i
lar
git-mergeto
o
l: properly handle "git m
e
r
g
etool
-
- fi
l
ename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
te
s
ts: add a testcase for "git submodule sy
n
c"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git
-
submodul
e
: a
d
d
"sync" com
m
a
nd
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git
-
su
b
m
o
d
ule
:
re
p
lace duplicat
e
d
c
o
d
e with a module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PATCH] g
i
tk
:
Do
n
't sh
o
w local changes
when
w
e there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree