repo.or.cz
/
git.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
D
a
vid Aguilar
mergetool
-
-lib:
a
dd suppo
r
t for a
r
axis me
r
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
me
r
getool--
l
i
b: specialize
d
iff options for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
Da
v
i
d Ag
u
ila
r
me
r
geto
o
l-
-
lib: simplify API usage by removi
n
g mor
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
d
i
fftool/mergetool
:
refactor comman
d
s to use git-me
r
g
etool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Agu
i
l
a
r
mer
g
eto
o
l: use $(
.
.
.
) inste
a
d of `b
a
ckticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguil
a
r
bash completio
n
: add gi
t
-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftool: add support for
a
d
ifftool
.
prom
p
t config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
i
d Aguilar
d
iff
t
ool: a
d
d
va
r
iou
s
git-d
i
f
f
tool
t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool
:
move 'git-
d
ifftool' out of con
t
ri
b
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Agu
i
l
a
r
dif
f
tool: add a -y shortc
u
t
for
-
-no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uila
r
difftool:
u
se p
e
rl bu
i
lt-ins wh
e
n
t
esting
f
or msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id A
g
u
i
lar
difftool
:
remove the backup f
i
le fe
a
tu
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
ool: remove mer
g
e options for opendiff, t
k
diff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Dav
i
d Aguila
r
ev
e
ryday: use the dash
l
ess form of git-i
n
i
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David A
g
ui
l
ar
con
t
ri
b
/dif
f
to
o
l: use a
s
eparate co
n
f
i
g
namespace f
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Agui
l
ar
c
ontrib/di
f
ftool
:
Don't repe
a
t
merge tool ca
n
didates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
di
f
ft
o
o
l: put the curso
r
on th
e
e
d
itable file for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
a
v
id
A
g
u
ilar
diffto
o
l: fix doc
u
menta
t
ion
p
roblems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David
A
guil
a
r
contr
i
b: add
'
git difftoo
l
'
for launching common merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
D
a
vid Aguilar
git-mergetool:
properly handle "git merge
t
ool -- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
D
a
vid Agui
l
ar
tes
t
s: a
d
d a testcase for "
g
it
submodu
l
e sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
Davi
d
Aguilar
git-
s
u
b
module: ad
d
"sync"
comman
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
Da
v
id Agu
i
lar
git-su
b
module:
r
eplac
e
d
u
plica
t
ed co
d
e with a module_li
s
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
Davi
d
Aguilar
[PATC
H
]
g
itk: Don't sho
w
local change
s
when we
t
here
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree