repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'ab/report-corrupt-object-with-type'
2010-08-17
Dav
i
d
A
gui
l
ar
m
e
rgetoo
l
: Skip autoresolved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
D
avid Aguilar
Documentation: Expl
a
in git-
m
ergetool's use of temp
o
rary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
D
a
vid A
g
uilar
Makefile: Remove usage o
f
de
p
recated Python "
h
as_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David
A
g
u
ilar
diff
t
oo
l
: Fi
x
'
-
-
gui' wh
e
n diff
.
g
u
i
too
l
is
un
c
onfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Dav
i
d
A
guilar
t78
0
0
-
difftool
.
sh: Tes
t
mergetool
.
pr
o
mpt f
a
llback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Dav
i
d Aguilar
difft
o
ol
:
Update copyrig
h
t notices to
l
i
s
t ea
c
h year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool: Use eval to expand
'--
e
xtcmd'
expression
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d Aguil
a
r
d
if
f
t
o
ol: Add '-
x
'
and as an ali
a
s for '-
-
ext
c
md'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t78
0
0-di
f
ftool
.
sh: S
i
mpl
i
fy the --e
x
tcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguil
a
r
git-diff
.
txt:
L
ink to git-d
i
fftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
d
ifftool: Allo
w
s
p
ecifying unco
n
figured commands wi
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
lar
difftool--helper: Remove
use
of
the GIT_M
E
RGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
uilar
difftool-
-
he
l
p
e
r: Update copyright and
r
emov
e
distr
a
cting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
gi
t
-dif
f
tool: Add '--gui' for selecti
n
g
a GUI to
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
A
guilar
t780
0
-difftool: Set a bog
u
s too
l
for
u
se by
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
D
a
vid
A
g
uilar
h
elp
:
Do not unnecess
a
rily look for a rep
o
sitory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguil
a
r
s
u
bm
o
dul
e
.
c
:
Sque
l
c
h
a
"
use be
f
ore assignment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguil
a
r
d
i
ff: generate
p
r
e
tty filenames
in prep_t
e
mp_blob
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add a b
a
sename() compatibility
f
u
nction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
co
m
pat: add a
m
k
stemps() c
o
mpatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Agu
i
lar
Add git
-
replace to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergetool--lib
:
add su
p
port for araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Ag
u
ilar
mergetool
-
-lib: specialize diff
o
p
tions for
e
me
r
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Agu
i
lar
mergetool-
-
lib: simp
l
ify AP
I
usage by remo
v
ing
m
ore
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
dif
f
to
o
l/mergetool: refactor com
m
ands to use git-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
me
r
getool
:
use $(
.
.
.
) instead of `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash completi
o
n:
add git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
av
i
d Aguilar
di
f
ftoo
l
: add su
p
port for a d
i
fft
o
ol
.
prom
p
t c
o
nfig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
u
ilar
difftool: a
d
d various git-diffto
o
l tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ftool: m
o
ve 'git-difftoo
l
' out o
f
c
on
t
r
i
b
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
Aguila
r
difftool
:
add a -y sho
r
t
c
ut
for --
n
o-pr
o
mpt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d
Aguilar
difftool: use perl
b
uil
t
-
ins when testing f
o
r msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid
A
guilar
diff
t
o
ol: re
m
ove t
h
e backup
file featur
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
tool: remove me
r
ge opti
o
ns for opendif
f
, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
D
a
vid Agu
i
lar
ev
e
r
y
day: use the dashless
f
orm of
g
it-
i
nit
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contrib/diffto
o
l: use
a
separat
e
config namespa
c
e fo
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
Davi
d
A
g
uilar
contrib/difftoo
l
: Don'
t
repeat merge
t
o
ol
c
andidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguila
r
dif
f
to
o
l
: put the cursor on the editable file
f
or Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
diff
t
ool: fix documentat
i
on problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David A
g
uilar
contrib: add
'
git difftool' for launching common merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
Davi
d
Agu
i
lar
git-merge
t
ool: properly handl
e
"
g
it
m
er
g
etool -- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguil
a
r
t
e
st
s
: add a testc
a
se for
"
gi
t
submo
d
ule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
g
i
t-submodule: add "sync" comma
n
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Agu
i
lar
git-submodule:
r
eplac
e
d
uplica
t
ed
code
w
ith a mo
d
ul
e
_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
Davi
d
Aguilar
[PATC
H
] gitk: Don't show local changes when we
there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree