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
Merge branch 'jk/execv-dashed-external'
2017-03-15
Da
v
i
d
Aguilar
difftool:
handle modified s
y
mlinks in dir
-
dif
f
mo
d
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
D
avid Agui
l
ar
t
7
800: cleanup cruft left behi
n
d by
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David Agui
l
a
r
t
7
80
0
: remove
whit
e
spac
e
before redirect
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
David Aguilar
t7800: re
p
l
ace "w
c
-l"
with te
s
t_line_count
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
David Ag
u
ilar
t78
0
0
: simplify bas
i
c
u
sage
t
est
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-06
David
A
guilar
difftool: f
i
x b
u
g w
h
en printing usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-01-18
David Aguilar
gitk:
R
emove tra
n
sla
t
ed m
e
s
sage from comment
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
a
vi
d
Aguilar
mergetools: fix xx
d
iff ho
t
keys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
a
vid
Aguilar
difftool: r
e
name
v
ariables for consistenc
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
Da
v
id A
g
uilar
difftool:
chdir
as
e
a
rly
a
s possib
l
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
a
v
id Aguilar
d
ifft
o
o
l: sanitize
$workdir a
s
early as possible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
Dav
i
d Aguilar
diff
t
ool: fix dir-d
i
ff index
c
r
eation when in
a subdirectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
David Aguilar
difft
o
ol
:
fix dir-dif
f
in
d
ex cr
e
atio
n
when in a sub
d
irectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Aguila
r
m
e
rgetools
/
v
imdiff: tru
s
t
Vim's exit code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Aguil
a
r
mer
g
etoo
l
: h
o
nor mer
g
etool
.
$tool
.
t
rustExitCode for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
me
r
ge
t
o
ol:
h
onor -O<orderfile>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
Da
v
id A
g
uilar
merget
o
ol: honor diff
.
orderFile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
me
r
getool
:
move main program flo
w
i
n
to a m
a
in()
fu
n
ct
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
D
avid Aguilar
m
er
g
etool: add copyright
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David A
g
uilar
d
i
fftool: use Git::* functio
n
s
instead of passing aro
u
nd
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguil
a
r
d
ifftool: avoid $
G
IT_DI
R
and $GIT_WORK_TREE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
subtree:
adjust function definitions
t
o match CodingG
u
ide
l
ines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Da
v
id Aguilar
s
ubtree: adjust style to matc
h
Co
d
ingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
D
av
i
d Aguilar
su
b
t
r
ee: fix "git subtree spli
t
--rej
o
in"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Davi
d
Agu
i
lar
t7900-sub
t
ree
.
s
h: fix quoting
a
nd broken && cha
i
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David
A
guilar
difftool: handle unmerged files in dir-diff mo
d
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
Davi
d
Aguilar
difftool: ini
t
ialize
v
ariab
l
es for readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
Dav
i
d Agu
i
l
a
r
mergeto
o
l: honor tempfile co
n
figuration when
r
esolving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David A
g
uil
a
r
mergetool: support delete/delete c
o
nflicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
David Aguil
a
r
difftool: ignor
e
symbolic li
n
ks in use
_
wt_file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David Aguilar
co
n
t
r
ib/subtree: ignor
e
log
.
d
ate conf
i
gurati
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
Davi
d
Agu
i
lar
merg
e
too
l
s: add
w
inmer
g
e
as
a bu
i
ltin tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Agu
i
lar
mer
g
etool--lib
:
se
t
I
FS fo
r
dif
f
tool and merg
e
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
me
r
getools: stop sett
i
ng $status in me
r
ge_cmd(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
mergetool:
s
i
mplify conditionals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Dav
i
d Ag
u
ilar
diffto
o
l
--helper: add explicit exit stat
e
m
ent
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
mergetool-
-
li
b
: r
e
move u
s
e of $status global
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David Aguilar
difftool: honor
-
-trust-exit
-
code
for
b
uiltin tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Aguilar
di
f
f
t
o
ol: add support fo
r
--trust-exit-c
o
de
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguila
r
t7610-mergetool
:
a
d
d test
c
as
e
s
for mergetool
.
writ
e
ToTem
p
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
Aguilar
mergetoo
l
: add
an option fo
r
writing to a temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetool:
use more cons
e
rv
a
tive te
m
p
or
a
ry fil
e
name
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
test-l
i
b-fu
n
cti
o
n
s
:
adjust style to match CodingGuidelin
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
guilar
t7610-m
e
rg
e
to
o
l:
use test
_
config to
i
solate tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguilar
merget
o
ols/mel
d
: make
u
sage of `
-
-ou
t
put` configur
a
ble
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
v
id Ag
u
il
a
r
g
it
-
s
h
-setu
p
: mov
e
GIT_D
I
R i
n
itializ
a
tion
into a f
u
nction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Ag
u
ilar
mergetool: use more con
s
er
v
a
tive temporary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid Ag
u
ilar
tes
t
-lib-function
s
:
a
d
j
ust st
y
le to match Codi
n
gGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-mergetool: prefer test_config o
v
er
git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
g
u
i
lar
t7610-mergetool: ad
d
missi
n
g && and remo
v
e
commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vid
Aguil
a
r
t
7610-me
r
getool: use
tabs instead
o
f a mix o
f
tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Aguilar
completion: ad
d
--sh
o
w-signature
for
log
and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
s
t
ash: prefe
r
--quiet over shell redirection of
the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
re
f
s:
m
ake rev-parse --quiet actually
q
u
iet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
Davi
d
A
g
uilar
t1503
:
us
e
test_must_
b
e_
e
m
pty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
D
a
vid
Ag
u
i
l
ar
Documenta
t
ion:
a
not
e
about stdout for g
i
t rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
D
a
vid
A
guilar
cleanups: e
n
s
u
r
e
that
g
i
t-compat-uti
l
.
h is included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David Aguilar
style
f
ix
:
asterisks stick to the variable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
Dav
i
d Aguilar
git
k
: Catch mkdt
e
m
p errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
a
vid Aguilar
gitk:
Use m
k
temp -d to avoid pre
d
ic
t
abl
e
t
emporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
av
i
d
A
guilar
gitk: Ho
n
o
r
TMPDIR w
h
en viewin
g
external diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Davi
d
Aguilar
di
f
ftool
:
supp
o
rt repositories wit
h
.
git
-
f
iles
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull: add --ff-only
to the help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David
Agu
i
la
r
pull: ad
d
pull
.
ff co
n
f
i
gu
r
ation
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
Da
v
id
A
guilar
ima
p
-send:
e
liminate HMAC deprecation
w
arnin
g
s o
n
M
a
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Agui
l
a
r
cache
.
h: e
l
iminate SHA
-
1
d
epr
e
c
ation w
a
rnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
a
vid Aguilar
Makefile: add support fo
r
Apple CommonCrypt
o
fa
c
ility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Agu
i
l
a
r
Make
f
ile: f
i
x
d
e
fault regex settings
o
n Darwi
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Agui
l
ar
me
r
g
e
t
ools/k
d
iff3: do not use --auto when di
f
f
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
Dav
i
d Aguilar
help
.
c: add a co
m
p
atibility
c
omment t
o
cm
d
_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib/mw
-
to
-
git/t/inst
a
l
l-wiki
.
sh: use a
l
owercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
ilar
contrib/examples/git-rem
o
t
e
.
perl: use a lowerca
s
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
A
guilar
tests: use a lowercase "usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
Aguilar
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
Docume
n
t
ation/user-manual
.
txt: use
a
l
owercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
t
em
p
l
a
tes/hooks--update
.
sample:
u
se
a
l
o
wercase "usa
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Agui
l
ar
contrib/hooks/setgitperms
.
per
l
: use
a
lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
ontrib/examples: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
A
g
u
i
l
ar
c
o
n
tri
b
/
f
ast-im
p
ort
/
impor
t
-
z
ips
.
py
:
use s
p
aces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
contrib/fast-import/import-zips
.
py: fix broken error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
contrib/fast-import: use a lo
w
ercas
e
"
usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid
Aguila
r
contrib/cr
e
dential: use a lowercase
"
usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
git-cvsimport: use a
l
owerc
a
se "usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git
-
cvsi
m
p
or
t
:
use a lowercase "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
g
i
t-cvse
x
p
o
rtcommit: u
s
e a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Ag
u
ilar
git-arch
i
m
p
ort:
u
s
e a lowercas
e
"usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
git-m
e
rg
e
-
o
ne-file: use a l
o
w
ercase "us
a
ge:" str
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
Agui
l
a
r
git-relink
:
use a l
o
wercase "us
a
g
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
g
i
t-svn: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
u
ilar
git-sh-
s
etup: use a lowerc
a
se "usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
avid
A
g
uilar
t
7
800: "defaults" is no
lon
g
er a builtin tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Ag
u
ilar
t7
8
00: moder
n
ize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Aguila
r
t7800: u
p
date copyright notic
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David A
g
ui
l
ar
di
f
ftoo
l
: silence uninitia
l
ized variable warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguil
a
r
p4mer
g
e
:
fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David
A
guilar
dif
f
tool--helper: fi
x
pr
i
n
tf us
a
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguila
r
doc: generate a
l
ist of
vali
d
merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
A
guilar
m
e
rge
t
o
ol--lib: add functions
f
o
r finding
available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Agui
l
ar
mergetool--l
i
b: impro
v
e t
h
e
help text i
n
guess
_
merge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Aguilar
merg
e
tool--lib:
s
i
mplify comm
a
nd expression
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next