repo.or.cz
/
git
/
srabbelier.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
mergetool--lib: add support for araxis merge
2009-05-24
David Agu
i
lar
mergetoo
l
-
-l
i
b: a
d
d su
p
port
f
or arax
i
s merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
m
e
rgetool--lib: sp
e
c
ial
i
ze diff op
t
i
ons for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
Dav
i
d
A
guilar
me
r
g
eto
o
l--lib: simplify AP
I
usage by removing
more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
difftool/m
e
rgetool: r
e
factor comman
d
s to
u
se git-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
mergetoo
l
: u
s
e
$(
.
.
.
)
i
n
stead of `ba
c
kticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
b
a
sh
c
o
mpletion:
a
dd
git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
diffto
o
l: add suppor
t
f
o
r a difftool
.
p
r
ompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
ool: add
v
arious git-diffto
o
l tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
difftool:
m
ov
e
'git-di
f
ftool' ou
t
o
f
contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid
A
guila
r
dif
f
t
ool: add a
-
y shortcu
t
for --no-
p
rompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: use
perl b
u
ilt-i
n
s when testing for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Agu
i
lar
difftool:
r
emove
t
he bac
k
up f
i
le fea
t
ure
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguil
a
r
d
iffto
o
l: remove merge options
for opend
i
ff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
Dav
i
d Aguilar
e
v
eryday: use the da
s
h
les
s
form of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
Davi
d
Ag
u
ila
r
co
n
trib/difft
o
o
l
:
u
se a separ
a
te config
namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
Davi
d
Aguilar
contrib/difftool: Don't
repea
t
merge t
o
ol candi
d
ates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
v
i
d Aguilar
difftool: put the cu
r
sor
o
n the editable file for Vi
m
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Agu
i
lar
difftool
:
fix docu
m
entati
o
n problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
D
a
vi
d
Ag
u
ilar
contri
b
: add
'git di
f
ftool' for launching common mer
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Agu
i
lar
git
-
mergetool: properly
handle "git merg
e
t
o
ol
-
- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
D
a
vid A
g
uilar
tests: ad
d
a testcase for "git submo
d
ul
e
s
ync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
Da
v
id Aguilar
g
i
t-sub
m
odule: add "sync
"
command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
D
a
vid Ag
u
ilar
g
i
t-submo
d
ule:
replace duplica
t
ed code with
a
module_lis
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[
P
ATCH] g
i
tk: Don'
t
s
h
ow local
c
hanges when we t
h
ere
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree