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
difftool: Eliminate global variables
2012-07-23
David
Aguilar
diffto
o
l: Eliminate global variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguila
r
difftool: S
i
mplify print_t
o
ol_hel
p
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
D
a
v
i
d
A
guilar
t7
8
00: T
e
s
t difftool p
a
ssing
arguments
t
o d
i
f
f
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David
A
guilar
m
e
rgetool:
P
r
o
v
i
d
e an em
p
ty file w
h
en needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Ma
k
efile: Im
p
rove compiler he
a
der dependen
c
y
chec
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Aguilar
mergetools
/
m
e
ld: Use
'
--output' whe
n
available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguil
a
r
mergetool
-
-lib:
R
efacto
r
t
o
ols i
n
to
separate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
i
d
Aguilar
mergetoo
l
--li
b
:
M
ake styl
e
consistent
with
g
i
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
A
guilar
d
i
fftool-
-
helper: M
a
ke st
y
le cons
i
s
t
ent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
Davi
d
Ag
u
ilar
t/t750
3
-pre-co
m
mit-hook
.
sh: Ad
d
GIT_PR
E
FIX tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
u
ilar
git-merge
t
ool--lib: Make vim
d
iff
r
et
a
in the current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Aguilar
git: Rem
o
ve h
a
ndling for
G
IT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setup: Provide GIT_PR
E
FIX to bu
i
lt-in
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Agu
i
l
a
r
su
b
module sync
:
Update "subm
o
d
u
le
.
<name>
.
url
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
Davi
d
A
guila
r
mergetool: Skip auto
r
e
solved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
D
a
vid
A
g
uilar
Doc
u
menta
t
ion:
E
xpla
i
n git-mergeto
o
l'
s
us
e
of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Da
v
id Agu
i
lar
Makefile:
R
emove usage of deprecat
e
d Python "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difft
o
o
l
: Fix '--gui
'
when diff
.
gui
t
ool
i
s unconfigur
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Ag
u
i
l
ar
t7800-difftool
.
sh: Test mer
g
etool
.
prompt fa
l
lbac
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
diffto
o
l:
U
pda
t
e copyrigh
t
not
i
c
e
s to
li
s
t each
year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid A
g
uilar
difftool: Us
e
eval to expand '--extcmd' expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
di
f
ftool
:
A
d
d '-x'
and as an al
i
as f
o
r '-
-
e
xtcm
d
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Agui
l
ar
t780
0
-dif
f
tool
.
sh: Simplify the --
e
xtcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Agui
l
ar
git-diff
.
txt:
L
ink to gi
t
-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
difftool: Allo
w
spe
c
ifying unco
n
fig
u
red commands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguilar
difftool--helper: Remove use of the GIT_ME
R
GE
_
TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
uilar
diff
t
o
o
l--help
e
r: Update copyright
and remov
e
distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-diffto
o
l: Add '--gui' for se
l
ecting a GUI
to
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id Aguila
r
t7800-diffto
o
l: Set a bogus tool for use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
D
avid Ag
u
ilar
help: Do no
t
unnecessarily l
o
ok
f
or a reposito
r
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodul
e
.
c:
Squelch a "us
e
befo
r
e assign
m
ent" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
di
f
f: generate
p
retty filenames
i
n prep_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguilar
c
o
mpat: add a basename()
c
ompatibilit
y
funct
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
u
i
l
a
r
c
ompat: add a mkstemps() c
o
mpatibility f
u
n
c
tion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
Add g
i
t
-replace to
.
gitign
o
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergetool--lib: ad
d
s
u
pport
f
or a
r
axis
m
er
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
D
a
vid Ag
u
ilar
mergetool--lib: spec
i
a
l
ize diff op
t
ion
s
for
em
e
rge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
Dav
i
d
A
g
u
i
l
ar
merg
e
t
ool--lib
:
si
m
pl
i
fy
API usage by removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
difftool/merg
e
tool: re
f
acto
r
co
m
m
ands to use git-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
merg
e
tool: use
$
(
.
.
.
)
i
n
s
te
a
d of `
b
ackti
c
ks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
bash co
m
pletion: ad
d
git
-
d
i
fftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add
s
upport fo
r
a d
i
fftool
.
prompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid A
g
uila
r
diff
t
ool: add
vario
u
s git-difftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftool: move 'g
i
t-diff
t
ool'
ou
t
o
f contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
di
f
ftool: ad
d
a -y shortcu
t
for --no-prom
p
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
di
f
ftoo
l
: use
p
er
l
bui
l
t
-
i
ns w
h
en
t
esting fo
r
msy
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
difftool: remove the backup file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
d
if
f
tool: r
e
move me
r
ge o
p
tions
fo
r
o
p
endif
f
,
t
kdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Dav
i
d
A
gu
i
l
a
r
e
veryd
a
y:
use
t
he
dashless form
o
f
git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Agui
l
ar
cont
r
ib/d
i
fftool: use a s
e
pa
r
ate config namespace
f
or
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
c
o
ntrib/difftool: Don't repeat mer
g
e
t
ool cand
i
da
t
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David
A
guilar
d
i
fft
o
ol: put
t
he cursor on t
h
e edit
a
ble
file for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool:
fix documentat
i
on p
r
oblems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
Da
v
id
Aguilar
c
o
n
t
rib: a
d
d
'gi
t
difft
o
ol' for lau
n
ching c
o
mmon me
r
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
Davi
d
Aguilar
git-mergetool: p
r
oper
l
y h
a
n
d
l
e
"gi
t
m
e
rget
o
ol -- filename
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
Davi
d
A
gui
l
ar
test
s
: add a testcase for "git submodule sy
n
c"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git-submod
u
le: ad
d
"sync" comman
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
D
a
vid
A
g
uilar
g
i
t-submo
d
ule: rep
l
ace duplicated
c
ode with a
m
odule_l
i
st
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PATCH] gitk: Don't
show loc
a
l changes
w
hen we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree