repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Makefile: add support for Apple CommonCrypto facility
2013-05-20
D
a
vid Ag
u
ila
r
Makefile:
a
dd
s
u
pport for Appl
e
CommonC
r
y
p
to facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
D
avi
d
Aguilar
Makefile: fix default regex settings on
Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
Da
v
id Agu
i
l
ar
mergetools/kd
i
ff3: do n
o
t use --auto wh
e
n diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Agu
i
lar
help
.
c: add a co
m
patibility co
m
ment to
c
md_ve
r
sion()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Aguilar
c
ont
r
ib/mw
-
t
o
-g
i
t/t/install
-
wiki
.
sh: use
a low
e
rcase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
ila
r
contri
b
/ex
a
m
ples/
g
it-r
e
m
o
t
e
.
perl:
use a
l
o
wer
c
a
s
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
v
id Ag
u
ilar
tests: us
e
a lowercase
"us
a
ge:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d Aguilar
git-svn: use a
lo
w
ercase "usage:"
st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
Aguilar
Docum
e
n
t
ation/user-
m
anual
.
t
xt: use
a
l
ower
c
ase
"usa
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d
Aguilar
templates/ho
o
ks--updat
e
.
sample: use a lo
w
er
c
ase "
u
s
a
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d
A
g
u
i
lar
contrib/hooks/
s
etgitperms
.
pe
r
l: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guila
r
contr
i
b/example
s
:
use a lowercas
e
"
u
sage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
co
n
tr
i
b/fast-import/impo
r
t-zips
.
p
y
:
use
s
paces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-impo
r
t/import-zips
.
py: fix broken err
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
c
o
ntrib/fast-im
p
ort: use a lowercase "usage
:
" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Agui
l
a
r
contr
i
b/c
r
edential: use a lowercase "
u
sa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-
cvsimport:
use a
l
owercase "usage
:
" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
git-
c
vsimport: use
a
lowercase "u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t-cvsexportcomm
i
t
:
u
se
a low
e
rcase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git
-
a
r
chimport
:
use a lowercase
"usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-merge-one-file: use a
lowercase "usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it-relink: use a lowercase "us
a
ge:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t
-sv
n
: use
a
lowercase "usa
g
e:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
A
guil
a
r
git-s
h
-setup: use a lowercase "usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: "
d
efa
u
lts" i
s
no lon
g
er
a
builtin tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
a
vid
A
guilar
t7800: moderni
z
e tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
D
a
vid Agui
l
ar
t780
0
:
u
p
date copyri
g
ht notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
Da
v
id Ag
u
ilar
difftool: si
l
ence unin
i
t
i
a
l
ize
d
variable
w
arning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
a
v
id Aguilar
p4merge: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
diffto
o
l--
h
elper: fix p
r
int
f
u
s
age
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Dav
i
d A
g
uilar
doc
:
generate a list of valid merge too
l
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Ag
u
ilar
merget
o
ol--lib: add functi
o
ns for finding a
v
aila
b
le
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mer
g
etool-
-
lib: improve the help text in guess_merge_tool
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Aguilar
merge
t
o
ol-
-
lib:
s
implify c
o
mm
a
nd expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Aguil
a
r
mergetools: simplify how
we handl
e
"vim" and "defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Da
v
id Ag
u
il
a
r
mergetool--lib:
i
mprove s
h
ow_tool_help() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
avid Agu
i
lar
merget
o
o
l
s/vim: r
e
move
r
edu
n
dant diff co
m
mand
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
Dav
i
d
A
guilar
merg
e
tool
s
/p4
m
erge: Honor
$TMPDIR for the /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Agu
i
lar
mer
g
etools/p4merg
e
: Handle "/
d
ev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
merge
t
o
ol--lib: Allo
w
custo
m
comm
a
nds to ov
e
r
r
i
de b
u
ilt-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vid Aguilar
gi
t
k: Rename 'tagcontents' to '
c
ached_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Ag
u
ilar
gitk: Teach "Rere
a
d
re
f
erences
"
to r
e
lo
a
d tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Dav
i
d Agu
i
lar
mergetool,d
i
ff
t
o
o
l: Document --tool-help consi
s
tently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
Aguil
a
r
difftool: D
i
sa
b
le --sy
m
l
i
nks
on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
di
f
ftool: Handle
c
o
mpare() retur
n
ing -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
di
f
f
t
o
o
l
:
W
rap long lin
e
s fo
r
rea
d
ability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David A
g
uilar
di
f
ftool: Check all
r
etur
n
codes
from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
d
i
fft
o
ol: Hand
l
e finding
m
ergetools/ in a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguil
a
r
d
i
ffto
o
l: U
s
e syml
i
nks w
h
en diff
i
n
g against the
w
o
rktre
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguila
r
diffto
o
l: Call t
h
e temp directory "git-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
di
f
ft
o
ol
:
Move option values
i
nt
o
a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
iff
t
o
ol:
E
l
iminate
g
lobal
variab
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
i
d Aguilar
di
f
ftool: Si
m
plify p
r
i
nt
_
t
o
ol_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Agu
i
lar
t
7
8
0
0
: Test
d
i
fftool pass
i
ng a
r
guments to
d
if
f
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
D
avid Aguilar
mergetool
:
Provide an empty
file when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David A
g
uilar
Makefile: Improve compiler header
d
ep
e
ndency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
Aguilar
mer
g
et
o
ols/meld: Use '
-
-output' when availabl
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
A
guilar
merge
t
o
o
l--lib: Refa
c
t
o
r too
l
s in
t
o s
e
p
arate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid
A
gui
l
ar
mergetool--lib: Make style consis
t
ent w
i
th git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
A
guilar
d
ifftool--helper:
M
ake style c
o
nsistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
Da
v
id Aguilar
t/t7503-pre-co
m
mit-hook
.
s
h: Ad
d
GIT_PREFIX tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git
-
mer
g
eto
o
l--lib:
M
ake vimdiff
r
et
a
i
n
the
c
urrent
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
i
lar
git: Remove handling for GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
uilar
set
u
p: Provide GIT_PREF
I
X
to built-i
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Agu
i
lar
submodule sync: Update "submodule
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David
A
guilar
merg
e
t
o
ol: Sk
i
p autoresolved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David
A
g
uilar
Docume
n
tation: Explain git-
m
ergetool
'
s u
s
e of tempora
r
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Davi
d
Aguilar
Makefil
e
:
Remove usage of d
e
precated Pytho
n
"has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
diff
t
o
o
l:
Fix '
-
-
g
ui' when diff
.
g
uitool is unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Davi
d
Aguilar
t78
0
0-difftool
.
s
h
: Test me
r
getoo
l
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Davi
d
Aguilar
difftool: Update copyright n
o
tices to list
each y
e
a
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
avi
d
Aguilar
dif
f
tool: Use eval to expand
'-
-
ex
t
cmd' expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
iff
t
ool: Add '-
x
' an
d
as an
a
lias for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguilar
t7
8
00-difftool
.
sh: Simplify th
e
--extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
ila
r
git-di
f
f
.
txt: Link to g
i
t-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool:
A
llow
s
pecifying
u
nconfigur
e
d com
m
ands wi
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
A
g
uil
a
r
difft
o
o
l
--h
e
lper: Rem
o
ve use of the
G
I
T
_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguilar
difftool--help
e
r: Update copyright and remove distrac
t
ing
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
Aguilar
git
-
difftoo
l
: Ad
d
'--gui' for sele
c
ting a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
a
v
i
d Aguilar
t7800-difftool: Set a bogus tool for use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David A
g
ui
l
ar
help: Do n
o
t unnec
e
ssarily look for a reposi
t
or
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguila
r
submo
d
ule
.
c
:
Squelch
a
"use
bef
o
re
assignm
e
nt" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Agui
l
ar
diff:
g
e
n
erate p
r
etty filenames in p
r
e
p
_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Ag
u
ilar
compa
t
: ad
d
a basename() compatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
i
d
Aguilar
com
p
at: add
a
mkstemps() co
m
p
a
tibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguila
r
A
dd
git-r
e
p
l
ace to
.
g
i
tignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
D
a
vid Aguilar
mergetool--lib: add su
p
p
o
rt
for a
r
axis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
Dav
i
d
A
guilar
mergetool
-
-
lib:
sp
e
cialize
d
iff option
s
for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David A
g
uilar
m
erget
o
ol--lib: simpli
f
y
A
PI usage
by removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
diffto
o
l
/
m
ergetool:
refactor c
o
mmands
t
o
us
e
git-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
uilar
mergetool: use $(
.
.
.
)
i
n
st
e
ad of `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
bash compl
e
ti
o
n: ad
d
git
-
d
iffto
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftool: add support for a
d
i
fftool
.
prompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agu
i
lar
difftool: add
vari
o
us git-d
i
fftool
t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
diffto
o
l: move 'git-diff
t
ool' out
o
f
c
o
ntrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Ag
u
ilar
d
i
fftool: add a -y sh
o
rt
c
ut for --
n
o-pro
m
p
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
difftool: use per
l
bui
l
t-
i
ns
when testing
f
o
r
m
sys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
diff
t
ool: r
e
move the
b
a
c
ku
p
file featur
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
Aguilar
di
f
ftoo
l
: r
e
move mer
g
e options
f
or op
e
ndiff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David
Aguilar
ev
e
ryday: use the dashless fo
r
m
of
g
it-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next