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
pkt-line.h: move comment closer to the associated code
2022-01-16
D
a
vid
Aguilar
build: centos/RHEL 7 ship
s
with an
olde
r
gcc and
z
lib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-13
Davi
d
Aguil
a
r
m
ergetools/
x
xdiff: prevent segfaul
t
s fr
o
m
stopping
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
Da
v
id Ag
u
ilar
difftool: add a missing
s
pace to the run_dir_diff(
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
D
a
vi
d
Aguilar
difftool:
r
em
o
ve an
u
nne
c
essary
c
all to strbuf_releas
e
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
David
Aguilar
difftool: refactor dir-diff
t
o
wri
t
e files using helper
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
Dav
i
d Aguila
r
difftool: create a tmpdir path wi
t
hout repeated slashe
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-09-23
David Aguila
r
difftool
:
fix s
y
mlink
-
f
ile writing in
di
r
-diff
m
ode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
D
a
vid Agu
i
lar
contrib/complet
i
on
:
fix zsh completion regression from
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2020-12-01
David Ag
u
il
a
r
g
i
t-gu
i
: ss
h
-askpass: add a checkbox to
s
how th
e
input
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2019-04-04
David Aguilar
contr
i
b/c
o
mpletion: add
sme
r
ge to th
e
merge
t
ool co
m
pletion
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2019-04-04
Dav
i
d Aguil
a
r
mergetools: add support fo
r
smerge (Sublime M
e
rge)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-06-19
D
avi
d
Ag
u
ilar
mergetools
/
m
eld
:
improv
e
compatibiilty with
Meld
o
n
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David Aguilar
difftool:
hand
l
e
m
o
dified sy
m
links in dir-d
i
ff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David Aguilar
t7800: cleanu
p
cruft
l
eft behind by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David Agu
i
lar
t
7800: remove whitespace before redirect
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
Dav
i
d Agui
l
a
r
t
7
8
00: replace "wc
-
l
"
wi
t
h
test_line_c
o
u
n
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
D
a
vid
A
guilar
t7800:
s
implif
y
basic
usage test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-06
David Aguilar
diff
t
ool:
fix bug when prin
t
in
g
usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-01-18
Davi
d
A
guilar
g
i
t
k: Remov
e
trans
l
ate
d
m
e
ss
a
g
e
from comment
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
merg
e
t
o
ols: fix
xxdiff h
o
tkeys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
difftool: renam
e
variables f
o
r
c
ons
i
s
t
en
c
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
Dav
i
d
Aguilar
diffto
o
l: chdir as
early as possible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
diffto
o
l: sanitize $wo
r
kdir a
s
earl
y
as possible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David
A
guilar
d
iff
t
ool: fix dir-dif
f
index
c
rea
t
ion when in a subdirectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
David Aguilar
d
i
fftool: fix d
i
r-diff ind
e
x creation when in a subdire
c
tory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Aguilar
mergetools/vi
m
diff: tr
u
s
t
V
i
m'
s
e
xit code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Ag
u
ilar
m
e
r
g
etool: honor mergetool
.
$tool
.
trustExi
t
Code for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David
Aguilar
merget
o
ol: honor -O<orderfile>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Ag
u
ilar
m
ergetool: honor diff
.
o
r
de
r
File
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
merget
o
ol
:
m
ove main
p
rogram fl
o
w
in
t
o a main
(
) function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
mergetool: add copyright
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Da
v
id Agui
l
a
r
d
i
fft
o
o
l
: us
e
Git::* functions i
n
stead of pas
s
in
g
around
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
D
avid Aguilar
d
i
f
f
too
l
: avoid $GIT_DIR and $G
I
T_WORK_TREE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David A
g
uilar
subtree: adjust functi
o
n definitio
n
s
to match Coding
G
uideli
n
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
subtre
e
:
a
djust s
t
y
l
e
t
o match CodingGuide
l
ines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Aguilar
subtree: fix "git s
u
btree spl
i
t
-
-rejoin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
D
a
vid Aguilar
t79
0
0-subtree
.
sh:
fix quotin
g
an
d
b
roken && chains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
D
a
vid Aguil
a
r
di
f
f
t
o
o
l: han
d
l
e
u
n
mer
g
ed f
i
les in
d
i
r-diff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
D
av
i
d
A
g
ui
l
ar
d
i
fftool: initialize variabl
e
s
for readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Agui
l
ar
mergetool: hon
o
r tempfi
l
e configur
a
t
i
on when resolving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
D
a
vi
d
Aguilar
mergetool: su
p
port dele
t
e/delete conflicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
David Aguilar
difftool: ignor
e
symbo
l
ic
links in use_wt_fi
l
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David
Aguilar
cont
r
ib/subtree: ignore l
o
g
.
date configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
mergetoo
l
s
:
a
dd
winmerge a
s
a
bui
l
tin to
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
merge
t
ool-
-
lib: set I
F
S for diffto
o
l and m
e
rgetool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Davi
d
Aguilar
m
erg
e
t
o
ols: stop
s
e
t
ting $status in me
r
ge_cmd()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Da
v
id Aguilar
merget
o
ol: simplify
c
o
nditionals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Ag
u
ilar
d
iff
t
o
o
l--he
l
per: add explicit exit
statement
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Da
v
id Ag
u
ilar
mer
g
et
o
o
l
--lib: re
m
ove use of $
s
tatus global
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
D
avid Aguilar
difftool: honor
--trust-exit-
c
ode f
o
r b
u
il
t
in tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David A
g
uilar
difft
o
ol: add support for --trus
t
-
exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
guilar
t7610
-
me
r
getool: add test cas
e
s
for m
e
rgetool
.
w
riteToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetool:
a
dd an op
t
ion for wr
i
ting to a temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
merg
e
tool: use more co
n
se
r
vative temporary
f
i
l
e
n
a
mes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agu
i
lar
test-lib-funct
i
ons: a
d
just st
y
le to ma
t
ch CodingGuidelin
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-mergetool: use t
e
st_c
o
nfig to isolate tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agu
i
lar
m
e
rgetoo
l
s/meld: make
u
sag
e
o
f `-
-
out
p
ut` con
f
ig
u
rable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
git-sh-se
t
up: move GIT_DIR
i
ni
t
ializa
t
ion into a funct
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Ag
u
ila
r
m
e
rgetool
:
use more conservative tempor
a
ry f
i
lenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David A
g
uilar
t
est-lib
-
functio
n
s: adjust style to
m
a
t
ch Codi
n
gGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
gui
l
ar
t7610-merget
o
o
l: prefer test_config over git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-merg
e
tool: add missi
n
g && and rem
o
ve commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Ag
u
il
a
r
t
7
6
10
-
merge
t
oo
l
:
u
s
e
tabs
instea
d
of a m
i
x of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David
A
guilar
completion: add --show-signature f
o
r
log and
show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguila
r
st
a
s
h
: p
r
efer --quiet over
she
l
l
r
e
d
ir
e
ctio
n
of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
refs: make rev-par
s
e -
-
q
uiet a
c
tually qui
e
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David
Aguilar
t1503:
use test_must_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
D
av
i
d
A
g
uil
a
r
D
ocumentation: a note about stdou
t
f
o
r gi
t
rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
cleanups: ensure that git-compat-u
t
i
l
.
h is included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David Aguilar
sty
l
efix: aste
r
is
k
s
s
tick
t
o
t
h
e variable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
Da
v
id Aguilar
gitk: Catc
h
mk
d
temp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk
:
U
s
e mktemp -
d
to a
v
o
i
d predictable
temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Davi
d
A
guilar
gitk: Honor TMPDI
R
when viewing ext
e
r
nal d
i
ffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David
Aguilar
difftool: support repos
i
tories with
.
g
it
-
files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Davi
d
Aguilar
p
u
ll: add
--ff-onl
y
to the hel
p
text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David
Ag
u
ilar
pull: ad
d
p
u
ll
.
ff co
n
figuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
imap-send: eliminate
HMAC dep
r
ecation warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Davi
d
Aguilar
cac
h
e
.
h
:
eliminate SHA
-
1
d
eprecation warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
Mak
e
file: ad
d
su
p
port for A
p
ple Co
m
monCrypt
o
f
acility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Aguilar
M
akefile: fix defa
u
lt regex set
t
ings on Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David
A
gu
i
lar
mergetools/k
d
iff3: do n
o
t use
--auto when diffin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David
A
guilar
help
.
c: add
a
compati
b
i
lity co
m
me
n
t to cmd_
v
er
s
ion()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Aguilar
c
ontrib/m
w
-to
-
gi
t
/t/install-wi
k
i
.
sh: use a
l
o
w
ercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
A
guilar
contrib/examples/git-remote
.
perl:
u
se a l
o
wercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Aguilar
tests: use a lower
c
ase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id
Aguil
a
r
g
it
-
s
v
n:
u
se a lowercas
e
"usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
D
o
c
umentati
o
n/user-manual
.
txt: use a lowerc
a
se "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
tem
p
l
a
tes/hooks--update
.
sample: use a lowercase
"us
a
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
contrib/
h
ooks/
s
etgi
t
pe
r
ms
.
pe
r
l
:
use a
lower
c
ase "u
s
age
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib
/
examples:
use
a l
o
werc
a
se "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Agu
i
lar
c
o
nt
r
ib
/
fast-impo
r
t/import-z
i
ps
.
py: use spa
c
es instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
contrib/fast-import/import-zips
.
py:
fix broke
n
e
r
r
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
ontrib/fas
t
-i
m
po
r
t
:
us
e
a lowercase "usage:" st
r
in
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
contrib/credential: use a lowercase "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguil
a
r
git-cv
s
import: use
a lo
w
erca
s
e "usage:" 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 lo
w
ercase "us
a
ge
:
" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it-cvsexportcommit: use a lowe
r
case "u
s
age
:
"
s
t
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-ar
c
himport:
u
se a lowercase "usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
g
it
-
merge-o
n
e-fi
l
e:
u
s
e
a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
git-relink: use a
l
owercase "
u
sage
:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next