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--helper: fix printf usage
2013-02-10
David Agu
i
lar
diff
t
ool--helpe
r
: fix printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David
Aguil
a
r
gitk:
Rename 'tag
c
o
ntents' to '
c
ached_t
a
gcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David
A
guilar
gitk
:
Teach "Reread refere
n
ces" to reload
t
ags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
Da
v
id Aguilar
t7800: Test
d
ifftoo
l
p
a
ssing argument
s
to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
Dav
i
d
Agui
l
ar
mergetool:
P
rovide an
empty file when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
D
avid Aguilar
M
a
kefile: Imp
r
ov
e
c
o
mpiler header depen
d
ency
c
heck
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetools
/
mel
d
: Use '--outp
u
t' when av
a
i
lable
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Aguilar
m
e
rgetool--lib: Refactor tools
i
nto
separate fi
l
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avi
d
A
g
u
ilar
mergetool--li
b
: Make style
consi
s
te
n
t
with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
l
a
r
difftool--helpe
r
: Ma
k
e
style
consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Ag
u
ilar
t/t7503
-
pre-c
o
mmit
-
hook
.
s
h
: Add GIT_PREFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git
-
me
r
get
o
ol--lib: Make vim
d
i
f
f retain
t
he
curren
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Aguilar
git: Remo
v
e handling for GIT_P
R
EFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setup: Provide GIT
_
PREFIX to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
D
a
vid
A
guilar
s
ubmodule sync: Update "su
b
module
.
<na
m
e>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
D
a
vid Aguil
a
r
m
ergetool: Skip au
t
ore
s
olved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id
A
gui
l
ar
D
o
cu
m
entation: Explain g
i
t-merg
e
too
l
'
s
use of temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
D
a
vid Aguilar
Makefile: Remove usa
g
e of deprecated P
y
tho
n
"has_ke
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
Dav
i
d Aguilar
diffto
o
l: Fix '-
-
gu
i
' when diff
.
guitool
i
s unconf
i
gured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
D
a
v
id Aguilar
t
7
8
0
0-difftool
.
sh: Test mergeto
o
l
.
pro
m
pt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difft
o
ol: Up
d
ate copyr
i
gh
t
notices to
l
i
s
t
e
ach year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id
A
guilar
difftool:
U
se eval
to expand '--extcmd' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguil
a
r
difftool: Add
'-x' and as
an alia
s
for
'--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agu
i
lar
t7
8
0
0
-difftool
.
sh: Simplify the
--extcm
d
test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
lar
git-diff
.
t
x
t: Link to
git-diffto
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool: Allow specifying unconfigured comma
n
d
s with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
diffto
o
l--helper: Rem
o
ve
us
e
o
f
the GIT_MERGE_T
O
OL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
dif
f
tool--helper
:
Update
c
opyright an
d
remove distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d
Aguilar
git-difftool:
A
dd '
-
-
g
ui
'
for sel
e
cting a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7800-d
i
f
fto
o
l: Set a
b
o
g
us
t
o
o
l for us
e
by tes
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Agu
i
lar
he
l
p: Do not unnecessarily look for
a
repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Ag
u
ilar
submodu
l
e
.
c: Squelch
a "use
b
e
for
e
ass
i
gnment
"
war
n
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
di
f
f: generate
pretty
file
n
ame
s
in prep_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
compat:
add a
b
asen
a
me(
)
compat
i
bil
i
ty
function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguila
r
compat: add a mkstem
p
s() compatibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
l
a
r
A
dd git-replac
e
to
.
g
itignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
D
a
vid Agu
i
la
r
mergetoo
l
--lib
:
ad
d
su
p
port for ar
a
xis
m
erge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Ag
u
ilar
mergetool--lib: specialize
d
iff opt
i
ons for eme
r
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
Da
v
id Aguila
r
mergetool--li
b
: s
i
mpl
i
fy API usage by remo
v
ing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
difft
o
ol/mergetool: refactor commands
t
o use git-
m
ergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
mergetool: use
$
(
.
.
.
) ins
t
ead of `backticks
`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
bash co
m
plet
i
on: add g
i
t-di
f
ftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
d
i
f
f
tool
:
add support for a difftool
.
p
r
o
m
p
t
config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
uilar
diff
t
ool:
a
dd various git-difftool t
e
sts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
u
ilar
d
ifftool
:
move 'git-d
i
fftool' out o
f
cont
r
i
b
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: ad
d
a -y sh
o
r
t
c
u
t
f
o
r
--no-p
r
o
mpt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftool: use perl bui
l
t-ins
w
hen
testing for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
u
i
lar
diffto
o
l: remove th
e
backup file
feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
d
ifftool: remov
e
me
r
ge o
p
tions for opendiff
,
tk
d
iff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguila
r
ever
y
day: use
the dashless
f
o
rm of git-in
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Ag
u
ilar
c
ontrib/d
i
fftool:
u
se a s
e
parate
c
onfig namespa
c
e f
o
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
Da
v
id
A
guilar
c
o
ntrib/difftoo
l
: Don't r
e
p
eat
merge tool
candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
id
Aguilar
d
i
f
f
tool: put the cursor on
t
he edita
b
le
file
for Vi
m
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftoo
l
: f
i
x documentation problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
con
t
ri
b
:
a
dd 'g
i
t
difftool
'
f
or lau
n
ching common merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-merget
o
ol: pr
o
p
erl
y
han
d
le "git
m
ergetool
-
- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
t
e
s
ts: add a testcas
e
for "git submodule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
D
a
vid Aguila
r
git
-
su
b
module: add "syn
c
" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
Dav
i
d Aguil
a
r
git-s
u
bmod
u
le: repl
a
ce d
u
plicated c
o
de with a
m
o
d
ule_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
Davi
d
Aguila
r
[
P
ATCH] gitk:
Don't show lo
c
al ch
a
nge
s
when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree