repo.or.cz
/
git
/
kirr.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t3903: fix broken test_must_fail calls
2010-07-19
D
avid Aguilar
D
ocument
a
tio
n
: E
x
plain git-mergetool'
s
us
e
of tempo
r
a
r
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Agui
l
ar
Makefile: Re
m
ove
usage of
deprecated Pyt
h
o
n
"has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
d
ifftool: Fix '
-
-
g
ui' when diff
.
gu
i
tool
is unconfi
g
ured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800
-
difftool
.
sh
:
Test mergetool
.
prom
p
t fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difftool:
U
pda
t
e
copyright notices to list
each
ye
a
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool
:
U
se eval to expan
d
'
-
-extcm
d
' ex
p
re
s
s
i
o
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguilar
difftool:
Add '-x' and
a
s an alias
for
'
--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7800-difftool
.
s
h
:
Simplify
t
he --extcmd t
e
st
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
a
r
g
it-diff
.
txt: Link
t
o
gi
t
-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool: Allow specifying unconfigured co
m
man
d
s wit
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Aguilar
difft
o
ol--helper: Remove use o
f
t
he GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
difft
o
ol--hel
p
e
r: Upd
a
t
e
copyright and remove
distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d A
g
ui
l
ar
g
i
t-difftool:
A
dd '--gui' fo
r
se
l
ecting a GU
I
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id Aguilar
t7800
-
diff
t
o
ol: Set a bogus tool
for use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help: Do not
unne
c
essarily look for a reposit
o
ry
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguil
a
r
s
ubmodule
.
c: Sq
u
elch a "use before assign
m
ent" warni
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
uil
a
r
d
if
f
:
generate pretty
filen
a
mes in prep_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Agu
i
lar
com
p
at: add a basen
a
me() compatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguilar
compat:
ad
d
a mkstemps() c
o
mpatibility
f
un
c
tio
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
Add git-re
p
la
c
e
to
.
g
i
t
i
gn
o
re
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
Dav
i
d Ag
u
il
a
r
mergetool--li
b
: add su
p
p
ort for araxis merg
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
D
avid Aguilar
m
e
r
g
etool-
-
lib: speci
a
liz
e
diff opt
i
ons for
emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
D
avid Aguilar
mergetool--lib: simplify AP
I
usage by removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agui
l
a
r
difftool
/
m
e
rgetool: refact
o
r commands to use git-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
mergetool: use $(
.
.
.
) in
s
t
e
ad of `
b
ackticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash c
o
mpletion: ad
d
g
it-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
d
i
fftool: add support for a
d
iff
t
ool
.
prompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id Aguilar
di
f
ft
o
ol: add various
git-difft
o
o
l tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid
A
g
uil
a
r
difftool:
move
'
git-
d
i
f
ftool'
o
ut of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
d
ifftool: a
d
d a
-
y shortcut for --no-
p
r
o
m
p
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguil
a
r
difftool: use p
e
rl built-ins
when
t
e
sting for
m
sys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
f
t
ool: rem
o
ve t
h
e backup f
i
le featu
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difftool: r
e
move merg
e
optio
n
s
f
or ope
n
d
i
ff,
t
kdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
D
av
i
d Aguilar
eve
r
yday: use the
d
ashless
f
orm of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contrib/difft
o
ol:
u
se a se
p
arate
c
on
f
ig namespace
f
or
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
contrib/difftool
:
Don
'
t repeat
m
erge tool can
d
i
dates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David
A
g
u
ilar
d
iff
t
ool: put t
h
e cu
r
sor o
n
t
h
e
ed
i
t
a
b
le f
i
le for Vi
m
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool:
fix documentation pr
o
blems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David
A
guilar
contrib
:
add '
g
i
t
difftool' for launc
h
ing comm
o
n mer
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
D
a
vid
A
g
u
ila
r
git-
m
er
g
eto
o
l: prop
e
r
l
y handle "gi
t
mer
g
etool -- filen
a
me"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Ag
u
ilar
tests: add a testcase fo
r
"git submodule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
D
a
vid Aguilar
git-sub
m
odule: ad
d
"sync"
c
ommand
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
Dav
i
d Agu
i
lar
g
it-sub
m
o
d
ule: re
p
la
c
e dup
l
icate
d
code
with a module_
l
ist
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Agui
l
ar
[P
A
TC
H
] gitk: Don't s
h
ow
loc
a
l
cha
n
ges when we ther
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree