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
t8001/t8002 (blame): modernize style
2013-05-21
D
avid Aguilar
i
map-send: el
i
minate HMAC
dep
r
ecatio
n
warning
s
o
n
M
ac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
a
vid Aguilar
ca
c
he
.
h
:
elimin
a
te SHA-1 de
p
recation
w
arnings on
Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
Makefile:
add support for
A
p
ple Commo
n
Cr
y
pt
o
f
ac
i
lity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Ag
u
il
a
r
Makefile: fix defa
u
lt regex setti
n
g
s
on Darwi
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
mergetools/kdiff3: d
o
not use --aut
o
when diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Agui
l
ar
hel
p
.
c: add a compati
b
ili
t
y c
o
mment to cmd_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id A
g
uilar
con
t
rib/mw-to-git/
t
/in
s
tall-wiki
.
sh
:
use a
l
ow
e
rcase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguil
a
r
contrib/examples/git-
r
emote
.
perl: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
test
s
: use a lowercase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id
A
gui
l
ar
git-svn: u
s
e
a
lowercase
"
u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avi
d
Aguilar
Do
c
u
m
e
n
tation/user
-
m
a
nual
.
txt
:
use a lowe
r
case "usa
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
t
e
mplates/hooks--update
.
sa
m
p
le
:
use a lowercase
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
co
n
trib/hooks
/
set
g
it
p
erm
s
.
perl:
u
s
e
a
lowe
r
case "
u
sage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Ag
u
ilar
contrib
/
e
x
amples:
u
se a lowerc
a
s
e "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d
Ag
u
ilar
contrib/fast-import/import-zips
.
py:
use spaces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
con
t
r
ib/
f
ast-i
m
p
ort/import-zip
s
.
py: fix broken error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
ontrib/fast-impor
t
: use
a
lowe
r
c
a
se "
u
sage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
c
o
ntr
i
b/credential
:
use a low
e
r
c
ase "usag
e
:
"
s
tr
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
av
i
d
Aguilar
gi
t
-cvsimport: use a lo
w
ercase "
u
s
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t-cvsimpor
t
:
u
s
e a lowercase "u
s
age:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id Agui
l
ar
git-cvse
x
portcommit: use a l
o
wercase
"usag
e
:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
git-arch
i
m
port: use a lowercase "
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
git-merge-on
e
-fi
l
e: use a
lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
Aguilar
git-r
e
link
:
use a lo
w
e
rc
a
se "usage:" s
t
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
gi
t
-svn: use a lowercase "usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid A
g
uilar
git-sh-
s
etup: use a lo
w
ercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
a
v
i
d Aguilar
t7800: "de
f
aults" is
no lon
g
er a
bu
i
l
t
in tool
name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Da
v
id
Aguilar
t
78
0
0
: modernize
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Aguilar
t7800: updat
e
copyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
D
a
vid Aguilar
difftool:
s
ilence
u
n
initialized
v
ari
a
bl
e
warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David A
g
uilar
p
4
m
erge: f
i
x printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David A
g
u
ila
r
difftool--helper: f
i
x pri
n
tf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Ag
u
ilar
d
oc: generate a list of va
l
id mer
g
e tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
mer
g
etool--lib
:
add functions for fin
d
ing available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguila
r
mergetool--
l
ib: impr
o
ve the
h
e
l
p text in guess_m
e
rg
e
_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguila
r
mergetool--
l
ib: s
i
mplify comman
d
expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David A
g
u
ilar
me
r
ge
t
ools: si
m
plify how we handle "vim" and "defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
m
erg
e
tool--lib: improve sh
o
w_
t
o
o
l
_
h
elp() outp
u
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid Aguilar
mergetools/vim: remove redund
a
nt diff comma
n
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
D
avid Aguilar
mergetools
/
p4merge: Honor $TMPDIR for
t
he /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
Da
v
i
d
Aguilar
m
erg
e
tools/p4me
r
ge:
Handle "/dev/nu
l
l"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
merget
o
ol--
l
ib: Allow cust
o
m commands to ove
r
rid
e
built
-
ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
g
i
t
k
:
Renam
e
'
t
a
gconten
t
s
'
t
o
'cached_tagco
n
tent
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vid Aguilar
gitk: T
e
ach "Reread
refe
r
en
c
es" to reload tag
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
me
r
ge
t
ool,diff
t
ool: Document --too
l
-help
consis
t
e
nt
l
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
diffto
o
l: Disable --symlinks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguila
r
diffto
o
l: Han
d
l
e
co
m
pare
(
) r
e
turni
n
g -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
avi
d
Aguilar
difftool: Wra
p
long lines fo
r
readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difft
o
ol: Check all ret
u
rn codes fr
o
m comp
a
re()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Davi
d
A
g
uil
a
r
diffto
o
l:
H
andle
f
inding mergetools/
in a path
w
i
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
gui
l
ar
difftool
:
Use syml
i
nks when
d
iff
i
ng against
t
he worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
u
i
lar
d
i
fft
o
ol: C
a
ll the tem
p
d
i
r
e
ctory "git-di
f
f
t
ool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
ila
r
d
i
fft
o
ol
:
Move opt
i
on values into a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid
A
guilar
d
iff
t
ool: Eliminat
e
gl
o
bal variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difft
o
ol: Simpl
i
fy print_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
Dav
i
d
Aguila
r
t7800
:
Test
d
iffto
o
l
p
as
s
ing argument
s
to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
D
avid
Aguilar
mergetool: Provide an em
p
ty
fi
l
e when
n
eede
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makefile: I
m
pro
v
e compi
l
er
h
eader dependency
c
he
c
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Agui
l
ar
merg
e
tools/meld:
U
se '--output' when ava
i
la
b
le
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
A
g
u
i
la
r
mergetool--li
b
: Refactor
t
ools
in
t
o
s
eparate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguilar
me
r
get
o
ol
-
-
l
ib: Make s
t
yl
e
consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agui
l
ar
d
i
fftool--
h
elper: Make s
t
yle consi
s
tent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
Dav
i
d Aguil
a
r
t/t7503
-
pre-commit
-
hook
.
sh: Add GIT_PREFI
X
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-mergetoo
l
--lib: Make vimdif
f
reta
i
n the curren
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Agui
l
ar
git: Remove handl
i
ng for GIT_P
R
EF
I
X
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
ilar
s
e
t
up: P
r
ovide
G
IT_PREFIX
to built-in
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodule sync:
Update "submodule
.
<name
>
.
url
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David
A
gui
l
ar
mergetool: Skip autore
s
ol
v
ed paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id Aguilar
Do
c
umentation
:
Explain git
-
m
e
rgetool's use of temp
o
rar
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefile: Remove usage of d
e
pr
e
cate
d
Python
"has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David A
g
u
i
lar
difftool: Fi
x
'--gui' when dif
f
.
guitool is unc
o
nfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
a
v
i
d
A
g
uilar
t7
8
00-
d
iff
t
o
ol
.
sh
:
Test
mer
g
etool
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
d
iff
t
ool: Upda
t
e copyrigh
t
not
i
ces to list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguil
a
r
d
ifftool: Use eval t
o
expa
n
d '--extcmd
'
expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difft
o
ol: Add
'
-x' and as an
a
lias for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Agui
l
ar
t
7
800-difftool
.
sh:
S
impli
f
y
the
--ext
c
md
test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-d
i
ff
.
txt
:
Link to git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid A
g
uilar
difftoo
l
: Allow specifyi
n
g
u
nconfi
g
u
red commands
w
ith
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
a
r
di
f
ftoo
l
--
h
elper:
R
em
o
ve use of the
G
I
T
_MERGE_TOO
L
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--helper: Update c
o
pyright and remove d
i
stracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
A
guilar
git-difftool: Add '--gui
'
for s
e
lecting
a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Davi
d
A
g
uila
r
t7800-diffto
o
l: Set a bogus
tool for u
s
e by test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
Dav
i
d Aguilar
h
elp
:
Do not unnecessarily loo
k
f
or a
repository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
Da
v
id Aguilar
su
b
module
.
c: Sque
l
c
h
a
"
u
se before assignment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid
Agui
l
ar
di
f
f
:
ge
n
erate pretty
fil
e
n
a
mes in prep
_
temp_bl
o
b()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
c
o
mpat: add a ba
s
ename() compatibi
l
ity function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid
Aguila
r
compat: add a mkste
m
p
s() compat
i
bility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguilar
Add git-
r
ep
l
ac
e
to
.
g
it
i
gnore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
D
avid Aguilar
mergetool--l
i
b: ad
d
support for ar
a
xis
m
erge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David A
g
u
il
a
r
mergetool--lib: spec
i
alize diff options for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetoo
l
--lib: simplify API usage by
removin
g
m
o
re
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftoo
l
/mergetool: refactor c
o
mmands to
use
g
i
t-merg
e
tool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
merge
t
ool: use $(
.
.
.
)
instead of `backt
i
c
ks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
b
ash comp
l
et
i
on: a
d
d git-d
i
ffto
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
dif
f
tool:
ad
d
su
p
port for a difftool
.
p
r
ompt
c
o
n
fig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool:
a
dd
v
arious
g
it-difftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
i
lar
difftool: mov
e
'
git-d
i
fft
o
ol'
out of
c
ontri
b
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguil
a
r
difftool: add a -y sh
o
rtcut for --n
o
-pr
o
mp
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguil
a
r
d
ifftool: us
e
perl built-ins whe
n
tes
t
ing for
msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguil
a
r
d
i
fftoo
l
: r
e
move the backup file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next