repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool--helper: add explicit exit statement
2010-01-23
Da
v
id
A
guilar
t
7
800-difftool
.
sh: Test merge
t
ool
.
prom
p
t fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
avid
A
guil
a
r
diff
t
ool:
U
p
d
ate copyri
g
ht n
o
tices to l
i
st each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
ilar
di
f
f
tool: Use eval
to expa
n
d '--
e
xtcmd' e
x
pressi
o
ns
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
i
f
f
tool: Ad
d
'-x'
a
nd a
s
an a
l
ias for '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
avid Aguilar
t
7
800-dif
f
tool
.
sh: Simplify t
h
e --ex
t
c
m
d
tes
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Aguilar
git-diff
.
txt
:
L
i
nk to git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool:
A
llow specify
i
ng
u
n
configured comman
d
s with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
diffto
o
l--he
l
per: Remove use of the
G
IT
_
M
E
RG
E
_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Aguil
a
r
d
i
fftool
-
-helper:
U
p
date copyri
g
ht and r
e
move di
s
tr
a
cting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
g
it-
d
ifftool: Add
'--
g
ui' f
o
r selecti
n
g a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id Aguilar
t7800
-
difftoo
l
:
Set a bogus tool for us
e
by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help
:
Do not unnecessarily look for
a repositor
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Agui
l
a
r
submod
u
l
e
.
c: Squelch a "u
s
e before a
s
signment"
w
ar
n
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id A
g
uilar
diff: genera
t
e pre
t
ty filenames in prep_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguil
a
r
compa
t
: add a basename() compatibili
t
y
function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d
A
guilar
com
p
a
t: add a
mkst
e
mps() compat
i
bility f
u
nction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguila
r
A
d
d git
-
replace to
.
g
itignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
Da
v
id Ag
u
ilar
mergetool--lib: add support for araxis mer
g
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
D
avid Agui
l
ar
mergetool--
l
ib:
s
p
ecialize diff option
s
for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
Davi
d
Agui
l
ar
merg
e
tool--lib: si
m
p
lify AP
I
usage by removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
d
i
fftool/mergeto
o
l
: refact
o
r
com
m
ands
t
o
u
se git-me
r
getool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
me
r
g
e
tool: use $(
.
.
.
) i
n
stead of `ba
c
kticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash completion:
a
dd
g
i
t-
d
ifftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diffto
o
l:
a
d
d
su
p
po
r
t for a difftool
.
p
ro
m
pt
c
onf
i
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftool: add vario
u
s
git-
d
ifftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
fftoo
l
: mov
e
'git
-
d
if
f
tool'
out of
contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
d
iffto
o
l: ad
d
a -y shortcu
t
for -
-
no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
av
i
d
A
g
u
ilar
diff
t
ool: use perl built-ins wh
e
n testing
f
or msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
difftool: r
e
move the
b
a
ck
u
p
f
i
l
e feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid
A
gu
i
lar
d
ifftool: re
m
ove merge options for opendif
f
, tkdi
f
f
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
D
av
i
d Aguilar
everyd
a
y: use t
h
e dashless form of git-
i
n
it
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
D
avid Agui
l
ar
cont
r
ib/difftool: use
a
s
eparate
c
onfig na
m
espace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
co
n
tri
b
/d
i
fft
o
ol: Don't r
e
peat merge t
o
ol
c
andidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Agui
l
ar
dif
f
tool: put the curs
o
r on th
e
edita
b
l
e
file for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
dif
f
tool: fix d
o
cumenta
t
ion prob
l
ems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
D
a
vid Agu
i
lar
cont
r
i
b
: add 'gi
t
difftoo
l
' for l
a
unchin
g
common
m
erge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetool
:
p
r
operly
h
a
ndl
e
"
git mergetool -- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
Davi
d
Agu
i
lar
tests: add a te
s
tcas
e
for "git subm
o
dule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
Dav
i
d Aguilar
git-
s
ubmodule: ad
d
"sync" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Ag
u
il
a
r
git-submodule: replace dup
l
icat
e
d code with a
module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PATCH]
gitk:
Don't show l
o
cal
c
hanges when
w
e the
r
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree