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
t0001: skip test with restrictive permissions if getpwd(3) respects them
2017-02-08
Da
v
id Aguilar
t7800: replace "wc -l"
w
i
t
h
t
e
s
t_
l
ine_co
u
n
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
David Agui
l
ar
t
7
800: sim
p
lify basic
usage test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-06
David Aguilar
diffto
o
l: f
i
x
bug when printing usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-01-18
David
A
g
ui
l
ar
gitk: Re
m
o
v
e t
r
ansl
a
ted mes
s
age from comment
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
Dav
i
d
A
gu
i
l
a
r
m
e
rgetools
:
fix xxdiff hotkeys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David
Aguilar
difftool: re
n
a
me varia
b
l
e
s fo
r
consistency
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
difftool: chd
i
r as early a
s
possible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
avid Aguilar
difftool: sanitize $workd
i
r a
s
ear
l
y
a
s p
o
ssible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguil
a
r
difftool:
f
i
x
dir-di
f
f index c
r
eat
i
o
n when in
a
s
u
b
directory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
David Aguilar
difftool: fix d
i
r-diff index crea
t
ion
w
h
en in
a
s
ubdirectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Agui
l
ar
mergetools/vimdiff: trust Vim's exit
c
ode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Aguilar
mergetool:
h
onor me
r
get
o
ol
.
$
t
ool
.
tru
s
t
Exit
C
ode fo
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Agui
l
ar
mergetool: honor -O<ord
e
r
f
il
e
>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
mergeto
o
l
:
honor diff
.
or
d
e
rFile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
D
a
v
id A
g
u
i
lar
mergetool
:
m
o
v
e m
a
in program flow into a main() function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
mergeto
o
l: add copyrigh
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
difftoo
l
: u
s
e
Git::* fun
c
tions instead of passing aroun
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguila
r
difftool
:
a
v
oid $GIT_D
I
R and
$
GIT_WORK_TREE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguila
r
subtree: adjust f
u
ncti
o
n def
i
nitions t
o
m
a
tch Cod
i
ngGui
d
elines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Davi
d
Aguil
a
r
su
b
t
r
ee: adjust style to match Cod
i
ngGuideline
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
D
a
vid Aguilar
subtree: fix "git
s
ubt
r
ee spl
i
t --
r
ejoin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David
A
guilar
t7900-subtree
.
sh: fix quot
i
ng and brok
e
n && c
h
ains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
Davi
d
Aguilar
difft
o
ol:
ha
n
dle un
m
erg
e
d file
s
in
d
i
r-diff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
Davi
d
Agu
i
lar
di
f
fto
o
l: ini
t
ialize var
i
ables for
r
ea
d
ability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguil
a
r
mergetool: honor tem
p
file configur
a
tion when resolving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguilar
mergetool: su
p
port delete/d
e
le
t
e conflicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
Dav
i
d Aguila
r
diffto
o
l: ignore
symbolic links in
u
se
_
w
t_file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David Agui
l
ar
cont
r
ib/sub
t
ree
:
ignor
e
log
.
da
t
e configurat
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
merge
t
ools
:
add winme
r
g
e as a buil
t
in tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
Davi
d
Ag
u
ilar
m
ergetool--l
i
b: set IFS for difftool an
d
me
r
getool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
avid Aguilar
merge
t
ools: stop se
t
ting $status
in merge_cmd()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David
A
guil
a
r
mergetool: simplify conditionals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Dav
i
d Aguilar
difftool--
h
e
l
per:
add explicit
e
xit statem
e
nt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David A
g
uilar
mergetool--lib: remove
u
se o
f
$s
t
a
tus global
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
Dav
i
d Aguilar
d
i
ff
t
ool: h
o
nor
--trust-exit
-
code
f
or builti
n
too
l
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David A
g
uilar
difftoo
l
: add support for --tr
u
st-exit-co
d
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguil
a
r
t7610-mergetool: add test c
a
ses for m
e
rgetool
.
wr
i
teToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetoo
l
: add
an
o
ption f
o
r
wr
i
ti
n
g
t
o
a t
e
m
porary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguila
r
mergeto
o
l: us
e
more conservativ
e
tempor
a
ry
filena
m
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
test-lib
-
functions:
a
djust style to
mat
c
h Cod
i
ngGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
uilar
t7
6
10-
m
ergetool: use test_config to isol
a
te
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d
A
g
uilar
m
e
rgetools/mel
d
: make usage of `--out
p
ut
`
confi
g
urable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguilar
g
it-sh
-
set
u
p: m
o
ve GIT_DI
R
in
i
tialization in
t
o a f
u
ncti
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
mergetool: use more conservat
i
v
e
temporary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Aguilar
test-
l
ib-fu
n
c
tions: adjust style to
matc
h
CodingGuidel
i
n
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Ag
u
i
l
ar
t7610-mergetool: prefer
test_config ov
e
r git
c
onfig
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
g
uila
r
t7610-mergetool
:
a
dd missing && and rem
o
ve comm
e
nted
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-mergetool
:
use tabs instead of a mix of ta
b
s
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Ag
u
i
lar
completion: a
d
d
-
-
show-signature for l
o
g and
show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
D
a
vi
d
Agui
l
a
r
stash: p
r
efe
r
--q
u
iet ove
r
shell r
e
direction of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Davi
d
A
guila
r
refs: make rev-parse --quiet actually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
D
avid Aguilar
t1503:
u
s
e
test_mu
s
t_be_em
p
ty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
D
ocu
m
entation
:
a n
o
te a
b
ou
t
st
d
out for git rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
D
a
vid
Aguilar
clean
u
ps: ens
u
re t
h
at gi
t
-
c
o
mpat
-
util
.
h i
s
inc
l
uded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David Aguilar
stylefix: ast
e
ris
k
s stick
to
t
he variable,
n
ot the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David Aguilar
gi
t
k: Catch mkdtemp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
avid Aguilar
gitk: Use mktemp
-
d to a
v
oid predic
t
able temporar
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
a
vid A
g
uilar
gitk: Honor
T
M
PDIR w
h
en viewing
external diff
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David
A
guilar
difftool: support repositories with
.
gi
t
-f
i
les
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
a
vid Aguilar
pul
l
: add -
-
ff-o
n
ly to the help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
avid Aguilar
pull:
a
dd pull
.
ff configu
r
ation
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
Dav
i
d
A
gu
i
lar
imap
-
send
:
elimi
n
ate HMAC deprecation warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David
A
guil
a
r
c
a
che
.
h
: eliminate SHA-
1
depreca
t
ion warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
a
vid Aguilar
Makef
i
le: add suppor
t
for Apple CommonCrypto facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Aguilar
Makefile: f
i
x default regex
s
e
t
t
ings on Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David
A
g
u
i
l
a
r
me
r
getools/kdiff3: do not use --
a
ut
o
w
h
en diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Agu
i
lar
help
.
c: a
d
d a compatibility comment to cmd_
v
ersion
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
v
i
d Aguilar
c
o
ntrib/mw-to
-
g
i
t/t/install-
w
iki
.
sh: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
Aguila
r
c
ontrib/exa
m
pl
e
s/
g
it-remote
.
perl:
u
s
e a
l
owercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avid Aguilar
t
ests: use a lower
c
a
s
e "us
a
ge:"
s
trin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid
A
guilar
g
i
t
-svn: us
e
a
lowercase "usage:" st
r
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
Documen
t
ation/user
-
manual
.
txt: use a
l
owe
r
c
ase
"
u
sage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
templ
a
t
es/
h
ooks--update
.
sample: use
a
lowercase
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid
Aguilar
contrib/hooks/setgitperms
.
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 lowercas
e
"u
s
a
g
e:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
contrib/fa
s
t
-
impor
t
/import-zips
.
py: use spaces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contr
i
b/f
a
st-import/imp
o
rt-zips
.
py
:
f
i
x broke
n
error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
co
n
trib/fast-import: use
a
lowercase
"usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/credential: use a
lowe
r
c
a
se "
u
sage:
"
stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-
c
vsimport: us
e
a l
o
wercase "usage:" st
r
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
g
it-cvsimport: use
a lowercas
e
"
u
sage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-
cvsexportcom
m
it:
u
se a lowe
r
case "usag
e
:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-archimport: us
e
a low
e
rcase "usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id
A
g
uilar
g
it-m
e
r
g
e-one-
f
il
e
:
us
e
a lowercase "us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Ag
u
ilar
git-relink: use a lower
c
a
s
e
"usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-svn: use a lowercase "usage
:
" str
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guil
a
r
git-sh
-
setup: use a l
o
wercase "usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David
Aguila
r
t7800:
"defaults"
is no longer a built
i
n
tool n
a
me
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
av
i
d
Aguilar
t7800: mod
e
rnize t
e
st
s
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
Davi
d
Aguila
r
d
ifft
o
ol: silence uni
n
i
t
i
alized variable
warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p
4
me
r
ge
:
fix print
f
u
s
age
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguila
r
d
i
fftoo
l
--hel
p
er: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
A
g
uilar
doc: generate a l
i
st of valid merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
merget
o
ol--lib:
add fun
c
ti
o
ns for
f
inding available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David A
g
uilar
mergetool--lib: improve
the help text in
g
uess_merge
_
tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
A
guila
r
m
ergetool--lib: simplify
c
ommand
e
xpr
e
s
sions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Agui
l
ar
mergetools: simplify
h
ow we handle "vim"
and "defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David A
g
uilar
me
r
geto
o
l--lib: improve sho
w
_
t
ool_he
l
p
(
) output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
avi
d
Ag
u
ilar
merg
e
too
l
s/
v
i
m
: remove
r
e
d
u
ndant diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next