repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
mingw: avoid mktemp() in mkstemp() implementation
2022-01-16
David Aguilar
b
u
i
ld: c
e
ntos/RHEL 7 shi
p
s wit
h
an older gcc
a
n
d zlib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-13
D
avid Aguilar
merge
t
ools/
x
xdiff: prevent segfaults from
s
to
p
p
i
n
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
David Agu
i
lar
diffto
o
l:
add a missing space to
the run_dir_diff(
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
David Aguilar
difftool: remove
an u
n
nece
s
sary cal
l
to strbuf_release()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
Da
v
id A
g
uilar
difftool: refactor dir-
d
iff to write fil
e
s usin
g
h
e
lper
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
D
avid Aguilar
difftool:
c
reat
e
a tmpdir p
a
th
withou
t
repeated slashes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-09-23
Davi
d
Aguilar
difft
o
ol
:
f
ix
symlink-file writing in dir-di
f
f
mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
David Aguilar
co
n
tri
b
/comple
t
ion: fix zsh completion regre
s
s
i
on from
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2020-12-01
D
avid Aguilar
git-gui: s
s
h-askpass: add a checkb
o
x to show the input
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2019-04-04
David Aguilar
contrib/compl
e
tion: ad
d
sm
e
r
g
e to
t
he mergetool complet
i
on
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2019-04-04
Dav
i
d Aguilar
mergetools: add sup
p
o
r
t for
s
m
e
rge (Sublime Me
r
ge)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-06-19
David Aguilar
mergetools
/
meld: improve comp
a
tibi
i
lty with Meld on
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David Aguilar
d
i
f
f
tool: handle modif
i
e
d syml
i
nks in dir-d
i
ff mod
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
Da
v
id Aguilar
t780
0
: cle
a
nu
p
c
r
uft left behind by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David
A
guilar
t7800: remove
w
hitespac
e
before re
d
irect
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
David Aguilar
t
7800: replac
e
"w
c
-l" with test_line_
c
ount
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
David Agu
i
lar
t780
0
: simplify bas
i
c usag
e
te
s
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-06
David Agui
l
ar
difft
o
ol: fix bug when printin
g
usag
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-01-18
D
a
vid Aguilar
git
k
: Rem
o
ve tran
s
lated message f
r
o
m
comme
n
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
mergetools: fix xx
d
iff hotke
y
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
a
vid Aguilar
diffto
o
l: rename varia
b
les for consiste
n
cy
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguila
r
difftoo
l
: chdir as early as possib
l
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
avid
A
guilar
di
f
ft
o
ol: sanitiz
e
$wor
k
dir as
e
arly as possi
b
l
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
a
v
id Aguilar
di
f
ftool: fix dir-diff index creation when in a su
b
d
ir
e
ctory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
D
a
vid
A
guilar
difft
o
ol: fix
di
r
-diff index creation whe
n
i
n a su
b
directory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Agu
i
lar
mergetools/vimdiff: trus
t
Vim's exit code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
Dav
i
d
Aguil
a
r
mergetool: hon
o
r mergetool
.
$tool
.
t
r
ustE
x
itCode f
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguila
r
m
e
rgetool:
h
onor -O<or
d
erfile>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguila
r
m
erge
t
ool: honor
d
i
f
f
.
orderFile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
D
avid Agui
l
ar
mergetoo
l
: move main pro
g
r
a
m flow into a mai
n
() function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David
A
guilar
mergetool: add copyright
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguil
a
r
dif
f
t
o
ol: use
Git:
:
* functions instead of
p
assin
g
around
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David A
g
uilar
difftool: avoid $GIT_DIR and $GIT_WORK_TREE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Dav
i
d Aguilar
subtree: adjust f
u
nction definitions
to match CodingGuidel
i
ne
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Davi
d
Ag
u
ilar
s
ubtree: a
d
ju
s
t style to ma
t
c
h CodingGuideli
n
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Dav
i
d Aguilar
subtree: fi
x
"git subtree
s
p
li
t
--rejoin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Aguilar
t7900-s
u
btree
.
sh: fix qu
o
t
i
ng and br
o
ke
n
&& chains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
Da
v
id Ag
u
ilar
difftoo
l
: hand
l
e unmerged files in
di
r
-diff mod
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David
Aguilar
difftool: initialize variable
s
for read
a
bility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguilar
mergetool
:
honor tempfile c
o
n
f
i
gu
r
ation w
h
en re
s
olving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
Dav
i
d
Agu
i
la
r
mergetool: support d
e
lete/delete conflicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
David Aguilar
d
iffto
o
l: ign
o
re s
y
mbolic link
s
in use_wt_file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David Aguilar
contrib/subtre
e
: ignore log
.
date con
f
iguration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
Da
v
id Aguila
r
merge
t
ools: add winmerg
e
as a builtin tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
Dav
i
d Agu
i
lar
mergetool--lib: set IFS for difft
o
ol
a
nd mergetool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
a
vid Agui
l
a
r
mer
g
etools:
s
to
p
s
e
t
ting $status i
n
merge_cm
d
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David
A
guilar
merge
t
ool: simplify conditio
n
als
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
di
f
ftool--helper:
a
dd
exp
l
ic
i
t exit statem
e
n
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Dav
i
d Aguilar
merg
e
tool--lib: remove u
s
e of $status global
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
D
av
i
d Aguilar
difftool: honor --trust-exit-code for buil
t
in tool
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
Da
v
id Aguilar
difftool: add support for --trust-e
x
it-cod
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
Agui
l
ar
t7610-mergetool: add t
e
st cases for
m
erge
t
ool
.
writeToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
m
e
rgetool: add an optio
n
for writing to a temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Ag
u
ilar
mergetool: use more con
s
ervative temporary f
i
le
n
a
m
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
test-lib-functions: adju
s
t styl
e
to match Codin
g
Guidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
guilar
t76
1
0-me
r
geto
o
l: us
e
test_config
t
o isola
t
e tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avi
d
Aguila
r
mergetoo
l
s
/meld: mak
e
usage of `--outpu
t
` configu
r
a
b
le
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
g
it-sh-setup: move GI
T
_DI
R
i
n
itializat
i
on into a fu
n
c
t
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
m
e
rgetool: use m
o
r
e
con
s
ervative tem
p
orary file
n
ames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Agu
i
lar
test-lib
-
f
u
n
ctions
:
ad
j
ust style
to match Codi
n
gGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
v
id
Aguilar
t
7610-me
r
getool: prefer test_c
o
nfig
over git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David A
g
uilar
t7
6
10-merget
o
ol: add missing && and remove commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Ag
u
ilar
t7610-merg
e
too
l
:
u
s
e
ta
b
s instead of a mix of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
D
avid Aguila
r
com
p
letion: add --show-signature fo
r
l
og and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
stash:
pre
f
er --quiet
over shell redirection o
f
the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Da
v
id Aguilar
re
f
s: make rev-pa
r
se --q
u
iet a
c
tually quie
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Aguilar
t1503:
use tes
t
_must_be_e
m
pty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David
A
guila
r
Documentation: a note about
std
o
u
t
for git re
v
-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David A
g
uilar
cleanup
s
:
e
n
s
u
re that g
i
t-
c
ompat-util
.
h i
s
in
c
luded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
D
a
vid Aguil
a
r
stylefix:
ast
e
ris
k
s stick
to th
e
v
a
riable
,
not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
D
a
vid
A
g
uilar
gitk: Catch mkdtemp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David
A
guilar
g
i
tk:
Use mkt
e
mp -
d
to
avoi
d
predictable
temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Agui
l
ar
gitk: Hono
r
TMPDIR when viewing e
x
ternal diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Aguilar
d
ifftool: support repositories wit
h
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pul
l
:
a
d
d -
-
f
f-on
l
y to the help
text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Dav
i
d Aguilar
pull: a
d
d pull
.
ff co
n
figuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
ima
p
-send:
e
l
iminate
HMAC deprec
a
ti
o
n
warnings on M
a
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Dav
i
d
A
g
u
ilar
c
a
c
h
e
.
h: eliminate SHA-1 depr
e
cati
o
n warnings
o
n
Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
a
vid Agu
i
lar
Makefi
l
e
:
a
d
d su
p
p
o
r
t
for Apple CommonCry
p
t
o facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Aguilar
Makefi
l
e: fi
x
d
efault
r
e
g
ex sett
i
ngs on Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
D
avid Agui
l
ar
mergetools/
k
diff3: do
not use --aut
o
when
diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David
A
gui
l
ar
h
e
lp
.
c: add a comp
a
tibility
commen
t
to cmd_ver
s
ion()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
uilar
con
t
rib/mw-to-git/t/install-wiki
.
sh: use a
lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d
Aguilar
con
t
rib/exampl
e
s/git-remote
.
perl: u
s
e a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avid Aguilar
tes
t
s:
use a l
o
wercase "
u
sag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
v
id Aguilar
git-svn: use a lowercase "
u
sage:"
s
tri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
D
o
c
u
mentation/user-manua
l
.
tx
t
: use a lowercase "usag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
template
s
/hooks--up
d
ate
.
samp
l
e: use
a lowercase
"
u
s
age
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Agu
i
lar
contrib/hooks/setgitperms
.
perl: use a
l
owercase "usa
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id
A
guilar
contrib/examples: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
contrib/fast-import/import-z
i
ps
.
p
y: use sp
a
ces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-impor
t
/import-zips
.
py: fix
broken error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
o
ntrib/fas
t
-impor
t
:
u
se
a
lower
c
ase "
u
sage:
"
str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id A
g
ui
l
a
r
contrib/creden
t
ial:
use a
lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
g
i
t-cv
s
i
mport: use a lowercase
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvs
i
mport: us
e
a lowe
r
case "usage
:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
gi
t
-cvsex
p
ort
c
ommit: use a lowercase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-archimport: us
e
a
lowercase "usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it-merge-one-fil
e
: use a
lowercase "usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-relink: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next