repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
tests: factor HOME=$(pwd) in test-lib.sh
2010-07-19
D
avid Aguilar
D
o
cumentation:
E
xplain g
i
t-mergetoo
l
's use of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefi
l
e: Re
m
ove us
a
ge of deprecated Pyt
h
o
n "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David
A
guilar
di
f
ftool: Fix
'
--gu
i
' when di
f
f
.
g
uitool is unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David
A
g
u
ilar
t78
0
0-diff
t
ool
.
sh: Te
s
t mergetool
.
prompt fall
b
ack
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Agu
i
lar
d
ifftool: Update copyrigh
t
noti
c
es to list e
a
ch ye
a
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguila
r
diffto
o
l: Use e
v
a
l
to
e
x
pand
'--
e
x
t
cmd' expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d Ag
u
il
a
r
difftool:
A
d
d '-x' and
a
s an alias for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
A
guilar
t7800-d
i
fftool
.
sh: Simplify the --extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
git-d
i
ff
.
txt
:
L
i
n
k
to
g
it-di
f
f
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid A
g
uil
a
r
difftoo
l
: Allow speci
f
yin
g
unconfigured commands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
a
r
diff
t
ool--helper: Remove
use of th
e
GI
T
_
M
ERG
E
_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftoo
l
--he
l
per: U
p
d
a
t
e copyright and
r
emove distr
a
cting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Ag
u
i
l
ar
git-difftoo
l
:
Add '--gui' f
o
r selecting a
GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguila
r
t7800-d
i
fftoo
l
:
S
et a bogus tool for use by
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
D
a
vid Aguilar
help: Do not unneces
s
arily look for a r
e
pository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguil
a
r
submodule
.
c: Squelc
h
a "use befor
e
assig
n
me
n
t" war
n
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
d
i
f
f:
gene
r
at
e
pret
t
y fil
e
names in prep_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
co
m
pat:
a
d
d a
basenam
e
()
c
ompatib
i
lity funct
i
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add a mkst
e
m
p
s() compa
t
ibil
i
t
y fun
c
tion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add g
i
t-rep
l
ace to
.
git
i
gnore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
Da
v
id Aguilar
m
erg
e
tool--
l
ib: add support for
a
r
a
x
i
s merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
Davi
d
A
guila
r
m
e
rgetoo
l
-
-lib: speci
a
l
i
ze diff o
p
tio
n
s f
o
r emerg
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetool--lib: simplify API usage b
y
removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftool/m
e
rg
e
tool: refa
c
tor commands t
o
u
se gi
t
-me
r
g
e
tool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
mergetool: use $(
.
.
.
) in
s
tead of `backtic
k
s
`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avi
d
Aguila
r
bash completion: add git-diffto
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftool:
a
dd support for a diff
t
ool
.
prompt
c
on
f
ig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftool: a
d
d various git-
d
i
fftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
dif
f
to
o
l: move 'git-difftool' o
u
t of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diffto
o
l: ad
d
a -y shortcut for --no-prom
p
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
oo
l
: use perl built
-
ins w
h
en testing for ms
y
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: re
m
ove th
e
back
u
p file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
t
o
ol: remove merge options f
o
r op
e
ndiff,
t
k
diff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
D
a
vid Aguilar
eve
r
yday: use the da
s
hless form
o
f git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David
Aguilar
c
o
ntr
i
b/difftool: use a
s
eparate c
o
nfig namespa
c
e for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David
Aguilar
contrib/difftool:
Do
n
't repeat merge t
o
ol candida
t
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David
Aguilar
difftoo
l
: put the curs
o
r on
th
e
editable file for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
id Aguilar
difftool:
fix
d
o
cumentation pro
b
lems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
Da
v
id
Aguilar
c
o
n
tr
i
b: add
'git difftool' for launch
i
ng common merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
Da
v
id Agu
i
l
a
r
g
it-mer
g
e
t
o
o
l
:
proper
l
y h
a
ndl
e
"gi
t
m
e
r
g
etoo
l
-- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
Da
v
id A
g
u
i
l
a
r
te
s
ts
:
add
a testcase for "git submodul
e
sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git-submo
d
ule: add "sync" co
m
mand
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
Dav
i
d Ag
u
i
l
ar
git-su
b
module: replace duplicated code with a mod
u
le_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PA
T
CH] g
i
tk: Don't show loc
a
l
cha
n
ges when we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree