repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge tag 'l10n-2.35.0-rnd2' of git://github.com/git-l10n/git-po
2022-01-16
Davi
d
Aguil
a
r
build: cen
t
os
/
RHEL 7 shi
p
s with an ol
d
er gcc
a
nd zlib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-13
David
A
guilar
merge
t
ools
/
x
x
di
f
f
: prevent segfau
l
ts from stop
p
ing
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
David Agu
i
lar
d
i
fftool: ad
d
a mi
s
sing space
t
o the run_d
i
r_diff
(
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
David
Aguilar
difftool: remove an
un
n
ecessary call to strbuf_rel
e
ase()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
Davi
d
Agui
l
ar
difft
o
ol: ref
a
ct
o
r dir-diff to
w
rite fi
l
es us
i
ng hel
p
er
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
D
avid Aguilar
d
iff
t
o
o
l
: create
a
tmpdir path w
i
thout repeated slashes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-09-23
David Ag
u
ilar
difftool
:
fix symlink-file
w
ri
t
ing
i
n dir-diff mo
d
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
Davi
d
Agu
i
lar
contrib/completion: fi
x
zs
h
completion
regression from
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2020-12-01
David Ag
u
ila
r
g
it-gui: ssh-askpa
s
s:
add a
checkbox
to show
t
he
input
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2019-04-04
D
avid Ag
u
ila
r
contrib/compl
e
tion
:
add smerge to the mergeto
o
l
c
omple
t
ion
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2019-04-04
Dav
i
d A
g
u
i
l
ar
m
ergetools: add sup
p
ort for smer
g
e (Sublime
Merg
e
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-06-19
David Aguilar
mergetools/meld: improve compatibiil
t
y with Mel
d
on
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David
Ag
u
ilar
d
i
fftoo
l
:
handle
m
o
d
ified sym
l
inks in dir-diff
mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
Da
v
id Aguilar
t
7
800
:
cle
a
nup cruft left behin
d
by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David
A
g
u
ilar
t7800: re
m
ove w
h
itespace before redirect
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
Davi
d
Ag
u
i
lar
t7800
:
replace "wc -l
"
with t
e
st_line_count
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
David Ag
u
i
lar
t780
0
: si
m
plify ba
s
ic usage
test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-06
David Aguilar
difftool: fi
x
bug wh
e
n printing
u
s
a
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-01-18
David Aguilar
gitk: Rem
o
ve tra
n
slated message
fr
o
m
c
omments
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David A
g
ui
l
ar
m
e
rgetools:
f
ix
xxdif
f
hotke
y
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David
Aguil
a
r
difftool:
rename variabl
e
s for consistency
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
di
f
ftoo
l
: chdi
r
a
s
early as pos
s
ibl
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
difftoo
l
: sanitize $w
o
rkdir as e
a
rly
as possible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Agui
l
ar
difftool: fix dir-diff index
c
reation
wh
e
n in a subdirector
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
D
avi
d
Aguilar
d
ifftool: fix dir-
d
i
ff index crea
t
ion
w
hen in a
subdirect
o
ry
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
D
a
vid Aguilar
me
r
geto
o
ls/vimdiff: trust
V
im's exit cod
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Aguilar
mergetool: honor
m
e
rgetool
.
$too
l
.
trust
E
xitCode for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
mergetool: hono
r
-O<ord
e
r
f
ile>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
Da
v
id Agu
i
l
a
r
mergetool: hon
o
r diff
.
o
rderFile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
m
erget
o
ol: move main p
r
ogram flow i
n
to a main(
)
fun
c
ti
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David
Aguil
a
r
m
e
rgetool: add
c
o
pyright
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
difft
o
ol: use Git::*
f
u
n
c
t
i
ons ins
t
e
a
d
of passing around
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
d
i
ff
t
ool: avoid $GIT_DIR and
$
GIT_WO
R
K_TREE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David
Agu
i
l
a
r
s
u
btr
e
e:
a
djus
t
function definitions
t
o
m
atch CodingGuideli
n
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David
A
gu
i
lar
subtree: adjust sty
l
e to match Co
d
ingGuideli
n
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Aguilar
subtree: f
i
x "
g
it
s
ubtree split -
-
rejoin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Aguilar
t7
9
00
-
subtree
.
s
h: fix quoting and
b
r
oken &&
chains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
Dav
i
d Aguilar
difft
o
ol: h
a
ndle unmerg
e
d files in dir-dif
f
mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
Davi
d
A
guilar
difftoo
l
: initi
a
lize variable
s
fo
r
r
ea
d
ab
i
li
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
D
a
vi
d
Ag
u
i
l
a
r
mergetoo
l
: h
o
nor t
e
mp
f
i
le configuration when resolv
i
ng
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
Da
v
id Aguilar
m
e
rgetool: support delete
/
delete confl
i
c
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
Dav
i
d
A
guilar
difftoo
l
: ignor
e
symb
o
l
i
c links in u
s
e_wt_
f
i
l
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David Ag
u
ilar
con
t
r
ib/subtr
e
e: ignor
e
log
.
date confi
g
u
ra
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Agui
l
ar
mergetools: add
w
i
nmerge as a builtin t
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
Dav
i
d Aguilar
mergetool--lib: set IFS for d
i
fftool and mergetool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
m
erge
t
ools: stop setting
$
status in m
e
rge_cmd()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguil
a
r
m
e
r
g
etool
:
s
i
m
p
l
ify cond
i
tionals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
dif
f
to
o
l--helper: add explicit exit stateme
n
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
mergetool--lib: remove use of $sta
t
us global
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David Aguilar
difft
o
ol: honor --tr
u
st-e
x
it-code fo
r
b
uilt
i
n
t
ools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Aguilar
d
i
f
ftool: add support f
o
r --trust-
e
x
it-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
gu
i
lar
t
7
6
1
0-mergetool: add test cases for mergetool
.
writeToTe
m
p
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mer
g
etool: add an option for writing to a temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
m
e
r
g
e
tool: use more conservati
v
e tempo
r
ary
f
ilenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Ag
u
ilar
te
s
t-lib-fu
n
ctions:
adjust st
y
l
e to
match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id Aguilar
t7610-merg
e
tool: use test_con
f
i
g
to isolate tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetools/meld: mak
e
usage of `--out
p
ut`
c
onfigurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Aguilar
git-sh-s
e
tup: mov
e
G
IT_DIR
i
n
i
tialization into a f
u
ncti
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguilar
merge
t
ool: us
e
more conservativ
e
temporary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid A
g
ui
l
a
r
tes
t
-lib-functio
n
s: ad
j
ust s
t
yle to
match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Agu
i
l
ar
t76
1
0-mergetoo
l
: prefer t
e
st_co
n
fig over
git c
o
nfig
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
guilar
t7610-m
e
rgeto
o
l: add
m
issing &&
and rem
o
ve
c
ommented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
Agui
l
ar
t7610-m
e
rgetool: u
s
e
t
abs instead of a mix o
f
ta
b
s
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Aguilar
c
ompletion: add --show-s
i
g
n
atu
r
e for log
and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
D
avid
Aguil
a
r
stash: pr
e
fer
--q
u
iet
ov
e
r
s
h
ell redi
r
ection of
the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguil
a
r
ref
s
: make rev-p
a
rse -
-
quiet
a
c
tually
q
u
i
et
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Aguila
r
t1503: use test_mus
t
_be_e
m
p
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
D
avid Agui
l
a
r
Docu
m
entation:
a note about
s
t
do
u
t for git rev-pars
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguila
r
clean
u
ps: e
n
sure that
g
it-compat-util
.
h is included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
Davi
d
Aguilar
stylefix: ast
e
risks
stick to
the variable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
Da
v
i
d Agui
l
ar
gitk: Catch
m
kdtemp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Dav
i
d
A
g
u
i
l
a
r
g
itk: Use mktemp -d to avoid p
r
edic
t
able temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Dav
i
d Agu
i
l
ar
gitk: Honor TMPD
I
R
w
hen viewing
ex
t
ernal diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
D
a
vid Agui
l
a
r
difftoo
l
: sup
p
ort repositories with
.
g
it-fi
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Da
v
id Agu
i
lar
pull: add --ff-only to
t
he help te
x
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
a
v
i
d Aguilar
pu
l
l
:
add
p
u
l
l
.
ff configura
t
i
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
Davi
d
Agui
l
ar
imap-send: elim
i
n
a
t
e
H
MAC deprecatio
n
warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
cache
.
h: elimin
a
te SHA-1 deprecati
o
n war
n
ings on Ma
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
M
a
kefile: add support
f
or
A
pple CommonCrypto
f
a
c
ilit
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
Davi
d
Aguila
r
Ma
k
efile: fix
d
efault regex settings on
D
a
rwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
merget
o
ols/kdiff
3
: do not use --
a
uto when dif
f
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
Davi
d
Ag
u
ilar
help
.
c: add a
c
o
mp
a
tibil
i
ty comment to
c
md_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Agu
i
lar
contrib/mw-to-g
i
t/t/ins
t
a
ll-wiki
.
sh
:
use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avid Aguilar
cont
r
ib/examples/git-remote
.
perl: us
e
a l
o
werc
a
se
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
ilar
t
e
sts: use
a
lower
c
ase "usa
g
e
:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
A
guilar
git-svn:
u
se a lowerca
s
e "usage
:
"
st
r
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
Document
a
t
i
o
n/user
-
manual
.
txt
:
use a
lowercase "u
s
age
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
te
m
plates/h
o
oks--up
d
ate
.
s
ample
:
use
a
lowercas
e
"
usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
con
t
rib/hooks
/
s
etgi
t
perms
.
perl: use a lowercase "u
s
age
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Ag
u
ilar
contrib/examp
l
es: use a
l
owercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
u
ilar
contrib/fast-impor
t
/import-
z
ip
s
.
py: use spaces ins
t
ead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Agu
i
lar
contrib/fast-
i
mport/import-zips
.
py: fix broken
error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Agu
i
lar
contrib
/
f
a
st-impor
t
: use a lowerc
a
se
"usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
contrib/cre
d
e
ntial: use a lowercase "usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
git-cvsimport
:
use a low
e
r
c
a
s
e "
u
sage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
A
g
uil
a
r
git-cvsimport: use a lowercas
e
"usa
g
e:"
s
tri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
git-cvse
x
p
o
rtco
m
mit: use a low
e
rc
a
se "usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
git-a
r
chimport: u
s
e a lowercase
"
u
s
age:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
git-merge-one-fil
e
: use a lowe
r
case "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-relink:
u
se a lowerc
a
se "usage
:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next