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
difftool: remove an unnecessary call to strbuf_release()
2021-10-01
D
a
vi
d
Agui
l
ar
d
i
ffto
o
l: rem
o
ve an
unnecessar
y
call
to strbuf_release()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
David A
g
uilar
difftool: refa
c
tor dir-diff to w
r
ite files using he
l
per
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
Dav
i
d Aguila
r
difftool: create a tmpdir pa
t
h
without
repeate
d
s
la
s
h
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-09-23
Dav
i
d Aguilar
difftool: fix symlink-
f
ile wr
i
ting in dir
-
diff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
Da
v
id A
g
uilar
c
o
ntrib/com
p
letion
:
fix zs
h
c
ompletion
r
egres
s
ion from
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2020-12-01
Da
v
id
A
gu
i
lar
git
-
gui: ssh-as
k
pa
s
s: add a checkbox to show the
i
n
put
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2019-04-04
Da
v
id Aguilar
contrib/c
o
mple
t
ion: add smerge to t
h
e mergetool com
p
l
etion
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2019-04-04
David Aguil
a
r
mergetools: add suppor
t
for smerge
(Su
b
lime Merge)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-06-19
D
a
vid Aguilar
m
e
rgetools/meld: improv
e
c
ompatibiilt
y
wit
h
Meld on
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
Dav
i
d Aguilar
dif
f
tool: han
d
le
modif
i
ed
symlinks in dir-diff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David
Aguila
r
t7800
:
cl
e
a
nup cruft left be
h
ind
by
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
Dav
i
d Agui
l
ar
t7800:
r
emove whit
e
s
pa
c
e
b
e
fore redirect
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
David Aguila
r
t7800: rep
l
a
c
e
"wc -l"
w
ith
t
e
st_line_count
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
D
a
vid Aguilar
t7800: s
i
mplify bas
i
c u
s
ag
e
test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-06
David
Agu
i
l
a
r
d
ifftool: fix bug when
printing usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-01-18
Davi
d
Aguil
a
r
g
i
tk: Remove tra
n
slated message from comments
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
mergetools: fix xxd
i
ff ho
t
k
eys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Agui
l
a
r
difftool
:
r
ename variabl
e
s for consistency
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
Davi
d
Aguilar
difftool:
ch
d
ir a
s
e
arly as possibl
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
difftool: sanitize $workdir as
e
a
r
ly as po
s
sible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguila
r
d
i
f
f
too
l
: fix dir-d
i
f
f
i
n
dex
c
reati
o
n when in a subdirectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
D
a
v
id Ag
u
ilar
difft
o
ol: fix dir-di
f
f index creation when in a subdirectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David
A
guilar
mergetools/vimdiff: tr
u
st
V
i
m
's exit code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
Davi
d
Aguilar
merg
e
t
ool: honor mergetool
.
$tool
.
trustExitCod
e
for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
D
avid Agu
i
lar
mergetool:
h
onor
-
O<o
r
d
erfile>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
Davi
d
Aguilar
mer
g
eto
o
l
:
h
onor d
i
ff
.
order
F
ile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David
Aguilar
mergetool: m
o
v
e
mai
n
program fl
o
w into a ma
i
n() fun
c
ti
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
D
a
vid Aguilar
merge
t
ool: add copyright
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
diffto
o
l:
us
e
Git::* fu
n
c
t
i
ons
i
nste
a
d of passing arou
n
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
diffto
o
l: avoid
$GIT
_
DI
R
a
n
d $GIT_
W
ORK_TREE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
sub
t
ree: adj
u
st fu
n
ction definitions to
m
a
tch
C
odingGu
i
deli
n
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
subtree
:
adjust
s
t
y
le to match C
o
dingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Agu
i
lar
subtree:
fix "git
s
ubtree split
--rejoi
n
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Da
v
i
d
Aguilar
t7900-subtree
.
sh:
fix
q
u
o
ting a
n
d broken && chains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Ag
u
ilar
d
i
f
f
t
o
ol: handle unmerged f
i
les in d
i
r-
d
iff mo
d
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David
Aguilar
di
f
ftool: initialize variables for readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguilar
merge
t
ool
:
honor tempfile c
o
nfiguration
when re
s
olving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguilar
m
erg
e
tool: support delet
e
/dele
t
e conf
l
ict
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
David Aguilar
difftoo
l
: ignore
s
y
mbolic link
s
i
n
u
se_wt_file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David
A
g
uilar
contrib/
s
ubtree: ignore log
.
date conf
i
gurati
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
mer
g
etool
s
: add
w
inm
e
rge as a builtin to
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
Davi
d
Aguilar
me
r
ge
t
ool--lib
:
set IFS
for difftool and mergetool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
m
e
rget
o
ol
s
: sto
p
setting $status
i
n merge_
c
md()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Davi
d
Aguilar
mergetool: simp
l
ify con
d
itionals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Davi
d
A
g
uilar
difftool-
-
helper: add
explicit exit
s
tatemen
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
mergetool
-
-lib: remove u
s
e of
$status
g
l
o
bal
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David Ag
u
ilar
difftool: honor --trus
t
-exit-code for builtin tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David
Aguilar
dif
f
t
ool: add support for --t
r
ust-exit-co
d
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
A
guilar
t7610-
m
ergetool: a
d
d test cases for mergetoo
l
.
writeToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguilar
merget
o
ol: ad
d
an
o
ption for writing to
a tempor
a
ry
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
u
ila
r
me
r
getool: use more conservative te
m
porar
y
filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id Aguilar
test-lib-fu
n
ct
i
ons: adjust
s
ty
l
e to match C
o
d
ingG
u
idelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-mergetool: use
test
_
c
onfig to iso
l
a
te tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
uilar
m
e
rg
e
to
o
l
s
/me
l
d: make usage
o
f
`
--output` configurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
git-s
h
-set
u
p: mov
e
GIT_DIR initialization i
n
to a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David A
g
u
ilar
m
erg
e
tool: use m
o
re conservative temporary
f
ilenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agui
l
ar
tes
t
-lib-functions: adjust sty
l
e to
matc
h
Codi
n
gG
u
i
d
elines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguilar
t7610-m
e
rge
t
ool:
p
refer
t
est_c
o
nfig ove
r
git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
v
i
d Aguilar
t7610-me
r
getool: add missing
&& and re
m
o
v
e
comment
e
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-me
r
g
e
tool: use tabs inste
a
d of a mix of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Aguilar
comp
l
etion
:
add --sho
w
-
signat
u
re
f
or log and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Da
v
id Agu
i
lar
s
t
ash
:
prefer --quiet over shell redirection o
f
t
he
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
D
a
v
i
d Aguilar
r
e
fs: make rev-parse
--q
u
iet actually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
Davi
d
Aguilar
t1503: use
t
e
st_must_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
Documentation: a
n
ote abou
t
stdout for git rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David
Aguilar
cl
e
anups: ensure th
a
t
g
it-compat-util
.
h is
inclu
d
ed
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
Dav
i
d Aguila
r
style
f
ix
:
aste
r
i
sks sti
c
k
to the v
a
riable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David Aguilar
gitk: Catch mkdtemp e
r
rors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
a
vid Aguilar
gitk:
U
se mktemp
-d to avo
i
d pred
i
ctable
temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Dav
i
d
A
guil
a
r
gitk: Honor TMPDIR when
viewing e
x
ternal diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Aguilar
diffto
o
l:
support repositories with
.
git-fil
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pu
l
l: add --ff
-
only to the h
e
lp text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull
:
ad
d
p
ull
.
ff configu
r
ation
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
D
a
vid Aguil
a
r
imap-send: elim
i
nate HMA
C
deprecation warn
i
ngs
on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David
A
gui
l
a
r
cache
.
h: elimina
t
e S
H
A-1
d
eprecatio
n
warnings
on M
a
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Agu
i
la
r
Makefile: a
d
d
suppo
r
t fo
r
Apple CommonCrypto facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David
A
guila
r
Makefile:
fix default re
g
ex settings on Da
r
win
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David A
g
uilar
mergetools/kdiff3
:
do
n
ot use --auto when diffi
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
Davi
d
A
gu
i
l
a
r
help
.
c: add a compatibility
c
omm
e
n
t to
cmd
_
v
e
rsion()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
ui
l
a
r
contrib/mw-t
o
-git/t/
i
nstall-wiki
.
s
h
:
use
a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
Ag
u
ilar
contrib/e
x
a
m
ples/git-remo
t
e
.
perl:
u
se
a
l
o
wercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d
Ag
u
ilar
test
s
: u
s
e
a lowercase "usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id
Aguil
a
r
git-s
v
n: use a lowerca
s
e "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Agu
i
lar
Documenta
t
ion/u
s
er-man
u
al
.
txt: use a lo
w
ercas
e
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
tem
p
lates/hooks--updat
e
.
sample:
u
se a lowercas
e
"
u
sage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguil
a
r
contrib/h
o
oks/setgitperms
.
perl: us
e
a low
e
rcas
e
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
co
n
trib/examples: use
a
l
o
wercase "usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Agui
l
ar
contrib/fast-impo
r
t/im
p
ort-zips
.
py:
u
se
spaces i
n
stead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
con
t
ri
b
/fast-i
m
por
t
/import-zips
.
py:
fix broken error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
cont
r
ib/fast-import: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/credential: us
e
a
l
ow
e
rcase "usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cv
s
import: use a lowercase "usa
g
e:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsimport: us
e
a lo
w
ercase "usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
A
guilar
git-cvse
x
po
r
tc
o
mmit: use a
l
o
w
e
r
case "
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Agui
l
a
r
git-archim
p
ort: use
a
lo
w
ercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
git
-
merg
e
-o
n
e-file: u
s
e
a lowe
r
case "usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid
Ag
u
ilar
gi
t
-relink: use
a
lowercase "usage:"
s
tri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-svn: use
a
lowercase
"
usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t-
s
h
-
setup: use a lowercas
e
"usage:
"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David A
g
uilar
t78
0
0:
"
defa
u
lts" i
s
no longer a builtin
t
ool n
a
me
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next