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
mergetool--lib: specialize diff options for emerge and ecmerge
2009-05-09
David Aguilar
me
r
ge
t
ool--l
i
b: specialize
diff options for
e
merg
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David
A
gu
i
lar
m
erget
o
ol--lib: s
i
mplify A
P
I usage by remo
v
ing m
o
r
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid
Aguilar
difftool/mergetool: ref
a
ctor c
o
mm
a
nds to us
e
git-me
r
g
e
tool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vi
d
Aguilar
mergetool:
u
se $(
.
.
.
)
i
nstead
of `
b
ackticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash comple
t
io
n
:
a
dd git-diff
t
ool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Agui
l
ar
difftool: add s
u
pp
o
rt for a difftool
.
prompt
c
onfig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add variou
s
git
-
difft
o
o
l tes
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguila
r
difftool: move 'git-diff
t
oo
l
' out of
c
ontrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
di
f
f
tool:
add a
-y
shortcut for
-
-no-pro
m
pt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agu
i
lar
d
i
fftool: u
s
e perl bui
l
t-ins when testing f
o
r msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
f
ftoo
l
: rem
o
ve
the back
u
p file featur
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
d
ifftool:
remove merg
e
option
s
for opend
i
ff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
everyday: us
e
the d
a
s
hless f
o
r
m
o
f
git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
co
n
tri
b
/diff
t
ool: u
s
e
a
separate config namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David
Agui
l
ar
co
n
tr
i
b/
d
ifftoo
l
: Don't
r
epeat
m
erge tool candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
av
i
d Aguilar
diff
t
o
ol
:
put the
c
urs
o
r on the edita
b
le
f
ile for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
vid Aguilar
difftool: fi
x
docume
n
tation probl
e
ms
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
Davi
d
Aguilar
con
t
r
ib:
a
dd 'git difftool'
f
o
r
launching common merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Ag
u
ilar
g
i
t
-
mergetool: prop
e
rly handle "git merget
o
ol -- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
D
a
v
i
d
Aguilar
tests: add a
testcas
e
for "g
i
t submodule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
g
i
t
-subm
o
dule:
a
dd "sync" c
o
m
m
a
nd
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
gi
t
-submodu
l
e: r
e
place d
u
plicated code with
a
modu
l
e
_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
D
a
vid
A
guila
r
[PATC
H
]
gi
t
k: Don
'
t show loc
a
l
c
h
ange
s
w
hen
we th
e
r
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree