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: support repositories with .git-files
2014-02-24
David Aguilar
difftool: support rep
o
sitories with
.
g
it-fil
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-21
Dav
i
d Aguila
r
imap-send
:
elimi
n
ate HMAC
de
p
recation warnings on M
a
c
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
cach
e
.
h: eliminat
e
SHA-1 deprecation warn
i
ngs
on
Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
Dav
i
d A
g
u
ilar
Makefile: add supp
o
rt for Apple CommonCrypto facility
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-11
Da
v
id Aguilar
Makefile:
fix defa
u
lt regex settings on
Darwi
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-09
Davi
d
Agu
i
lar
mergetoo
l
s/kdi
f
f3: do not use -
-
aut
o
when di
f
f
i
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-04-16
D
a
vid Aguilar
h
e
lp
.
c
: add a co
m
patibility
c
o
m
ment
t
o cmd_
v
ersion()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
D
avid Aguila
r
con
t
rib
/
m
w
-
t
o-git/t
/
inst
a
ll-w
i
ki
.
sh: use
a lowercase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David
Agui
l
ar
contrib/
e
xamples/gi
t
-remote
.
perl: use
a lowercase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
tests:
use a lowercase "usag
e
:
" strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
i
d Aguilar
gi
t
-svn:
use a lowerc
a
se "u
s
age:" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
gui
l
ar
D
o
cumentation
/
user-manual
.
txt:
u
se
a lo
w
ercase
"
us
a
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
A
g
uilar
tem
p
la
t
es/
h
o
o
ks--up
d
a
t
e
.
s
ample: use a lowercase "us
a
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
c
o
ntrib/hooks/set
g
it
p
erms
.
perl:
use
a lowercase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
contrib/examples
:
use a lowercase "
u
sage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Ag
u
ilar
contrib/fas
t
-
i
mp
o
rt/imp
o
rt-zips
.
py:
use spac
e
s instead
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
contrib/fast-imp
o
r
t
/import-z
i
ps
.
py
:
fix b
r
oken erro
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
la
r
c
on
t
ri
b
/fa
s
t-
i
mport:
us
e
a lowercas
e
"usage:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
c
o
ntrib/crede
n
tial:
u
se a lowercase "usage
:
"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
git-c
v
simport: use a low
e
rcase "
u
s
a
ge:" s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
git-cvsi
m
port: use a lowercase "usag
e
:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-cvsexport
c
o
m
mit: use a lowercase "usage:" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
g
i
t
-
a
rchimport: use a lowercase "us
a
ge:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguil
a
r
git-merge-one-file: use a lowerca
s
e "usa
g
e
:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
g
it-r
e
link: use a lowercase "usage:" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
ui
l
ar
git-s
v
n
: use a lowercase "usag
e
:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
la
r
git-sh-setup: use
a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
Da
v
id Aguilar
t7800: "defaults" is no longer a
built
i
n tool
name
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David Aguila
r
t7800
:
mod
e
rnize tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
David
Aguilar
t
7
8
0
0
: update copyr
i
gh
t
noti
c
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
David
A
g
uila
r
d
ifftool
:
s
i
lence uninitial
i
zed variab
l
e warni
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid Aguilar
p4mer
g
e: fix prin
t
f usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David A
g
uilar
di
f
ftool--he
l
per: fix pri
n
tf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguil
a
r
doc: g
e
nerate a list of
v
ali
d
merge tool
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
m
e
rget
o
ol--
l
ib
:
add functions
for finding availabl
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
A
gui
l
ar
mergetool--li
b
: imp
r
o
v
e
t
h
e help text
i
n
g
uess_me
r
ge_
t
o
o
l()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool
-
-
l
ib: simplify c
o
mmand expressi
o
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguila
r
mergetools:
simpl
i
fy
how we
h
andle "v
i
m" and "defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David A
g
uilar
me
r
ge
t
ool--l
i
b:
improve sho
w
_tool_hel
p
(
) ou
t
p
u
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Davi
d
Aguil
a
r
me
r
g
e
t
ools/vim: remove redundant diff command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
Dav
i
d Ag
u
i
l
a
r
merget
o
ols/p
4
merge
:
Honor $TM
P
DIR for t
h
e
/
de
v
/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
Da
v
id Aguilar
mergetools/p4mer
g
e: Handle
"
/dev/
n
ull"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Agu
i
l
ar
mer
g
etool--lib: Allow custom commands to overr
i
de built-in
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d Aguilar
gi
t
k: Rename
'
tagcon
t
ents' to '
c
ached
_
ta
g
c
o
n
t
en
t
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Agui
l
a
r
gi
t
k: Teach "R
e
re
a
d re
f
erences" to re
l
oad ta
g
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
D
avid Aguil
a
r
m
e
rgetoo
l
,diff
t
ool
:
Document --t
o
ol-h
e
lp co
n
s
i
s
t
e
ntly
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Disabl
e
--symlinks on cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
di
f
ftool: Han
d
le co
m
pa
r
e() returni
n
g -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Agui
l
ar
d
i
ffto
o
l
: Wrap lo
n
g line
s
f
o
r readabil
i
ty
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d
A
guilar
dif
f
t
ool: Che
c
k all re
t
urn codes from c
o
mpare
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id Aguil
a
r
difftool: Handl
e
finding mer
g
e
t
ools/ i
n
a
p
at
h
with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguilar
difft
o
o
l: Us
e
s
y
mlinks when
diffing
a
gain
s
t
the worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
A
g
u
ila
r
difftool: Call the temp
d
irect
o
r
y
"
git-diffto
o
l"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Agu
i
lar
difftool: Mo
v
e option valu
e
s in
t
o a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
difftool: Eliminat
e
glo
b
al va
r
iables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
avid
A
gu
i
lar
difftool: Simplify
p
rin
t
_tool_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
Dav
i
d A
g
uilar
t78
0
0: Test difftool passing
a
rgu
m
ents to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David
A
guilar
merg
e
too
l
: Provid
e
a
n
e
mp
t
y
file
when
needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
Dav
i
d Aguilar
Makefile: Improv
e
comp
i
ler he
a
d
e
r dependency
check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
m
e
rgetools/meld: Use '--ou
t
put' when availa
b
le
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merge
t
ool--lib: R
e
factor tools into
separate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Agui
l
ar
mer
g
etool--li
b
: Make style c
o
nsiste
n
t
w
it
h
git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
l
a
r
d
i
fftool--helper
:
Make style con
s
istent with g
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Ag
u
i
lar
t/t7503-p
r
e-commi
t
-
h
ook
.
sh: Add GIT_PREFIX te
s
ts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguila
r
git-mer
g
eto
o
l
-
-lib: Ma
k
e vimdiff retai
n
t
he current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
A
gui
l
ar
g
i
t
:
Remove
h
a
n
d
li
n
g fo
r
G
I
T_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David
Ag
u
i
lar
setup: Provide GIT
_
P
REFIX to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
s
u
b
mo
d
ule
sync: Update
"
submodule
.
<name>
.
u
r
l"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David
A
g
uilar
m
erge
t
ool
:
Skip autoresolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
D
avid Aguilar
Do
c
umentat
i
o
n
: Expla
i
n
g
i
t
-mergetool's
use of temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David A
g
uilar
Mak
e
file: Remove
us
a
ge of deprecated Python
"
has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
Davi
d
Aguilar
difftool: Fix '--gui' when di
f
f
.
guitool
i
s unconfigure
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
D
a
vid Aguilar
t7800-difftool
.
sh
:
Te
s
t m
e
rgetool
.
prompt fall
b
ack
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
avid Aguilar
difftool: Update copyright
no
t
ices t
o
list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
dif
f
tool: Use eval to expand '--extcmd' expres
s
ions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d
Aguilar
di
f
ftool: Ad
d
'-x' and
as an alias for '--extcm
d
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t78
0
0-difftool
.
sh: S
i
mpl
i
fy the --ext
c
md test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguila
r
g
it
-
diff
.
txt
:
Link
to git-d
i
fftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
difftool: Allo
w
specifyin
g
u
nco
n
figured comman
d
s
w
ith
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Agu
i
lar
difftool--helper: R
e
move use of
the GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
ilar
difftoo
l
-
-
he
l
per: Updat
e
c
o
pyright
a
nd remove distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid Aguila
r
g
i
t-diffto
o
l: Add '--g
u
i'
f
o
r sele
c
t
i
ng a GU
I
t
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
avid Aguilar
t7800
-
difftool:
S
et a
b
ogus
too
l
fo
r
us
e
by tes
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help: Do not un
n
ecessarily l
o
ok for a repositor
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
sub
m
odule
.
c: Squelc
h
a "use before
a
ssignment" warn
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguilar
diff: generate
p
retty filenames in prep_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
compat: add a basename() compatibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguilar
com
p
at: add a mkste
m
ps()
c
ompatibility
f
u
n
c
tion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
A
gu
i
lar
Add git-replace to
.
gi
t
ignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
D
a
vid A
g
uilar
mer
g
etool-
-
l
ib: add s
u
pport f
o
r a
r
axis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David
A
g
uilar
mergetool
-
-lib: special
i
z
e
d
i
ff
o
ptions
for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetool--lib: simplify API usage by removing mor
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id
A
g
uilar
difftool/mergetool
:
re
f
actor commands to use git-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avi
d
Agui
l
ar
mergetool
:
us
e
$(
.
.
.
)
i
n
stead of `backtick
s
`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
b
a
sh comp
l
e
t
ion: add
g
it-difft
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id Aguilar
difftool: add s
u
p
port
f
or
a diff
t
ool
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uila
r
difftool:
add
vari
o
us gi
t
-diffto
o
l tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: move 'git-difftoo
l
' o
u
t of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
dif
f
tool: add a -y shortcut for --no-pr
o
mpt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
il
a
r
difftoo
l
: u
s
e perl built-i
n
s when testin
g
fo
r
msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next