repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git_extract_argv0_path: do nothing without RUNTIME_PREFIX
2017-02-08
D
a
vid
A
g
u
ilar
t7800: rep
l
ace "wc -l" with test_lin
e
_count
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
Da
v
id Aguilar
t7800: simplif
y
b
asic
usage test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-06
David
A
g
uil
a
r
di
f
f
t
ool:
f
i
x bug when printing usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-01-18
David Aguil
a
r
gitk: R
e
move
t
r
a
nslated
message from comme
n
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
mergetools: fix xxdiff hotkeys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguil
a
r
d
if
f
t
o
ol:
r
ename variables
f
o
r consist
e
n
cy
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
a
vid Aguilar
d
iffto
o
l: chdir as early as possible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
d
ifftool: sanitize $workdir as early as
possib
l
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
di
f
ftool:
f
ix dir-di
f
f index
creation
wh
e
n in a s
u
b
di
r
ectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
David
A
guilar
di
f
ftool: fix di
r
-diff index creation when in
a
sub
d
irectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Aguila
r
merge
t
o
o
ls/vimdi
f
f: trust V
i
m's exit
c
ode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Aguilar
merg
e
tool: h
o
nor
me
r
getool
.
$tool
.
tr
u
s
t
E
xitCo
d
e for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
D
avid Aguilar
m
ergetool: hono
r
-O<o
r
derfile
>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguil
a
r
mer
g
etool:
h
o
nor dif
f
.
orderFile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
Davi
d
Aguila
r
mergetool
:
m
o
ve main pro
g
ra
m
fl
o
w i
n
to a main() funct
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
m
e
rg
e
t
ool:
a
dd copyright
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
diffto
o
l: use
G
i
t
:
:
* func
t
ion
s
in
s
tead of
p
assi
n
g a
r
ou
n
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Agui
l
ar
d
if
f
tool:
avoid $GIT
_
D
I
R and $GIT_WORK_T
R
EE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Agui
l
ar
subtree: adjust function definitio
n
s to mat
c
h Cod
i
ngGuidel
i
nes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguila
r
s
u
b
tree: adjust style t
o
match
C
o
d
i
ngGuideli
n
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Aguilar
su
b
t
re
e
: fix "git subtree split
-
-rejoin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David A
g
uilar
t
7
900
-
subtree
.
s
h:
f
ix
qu
o
ting and brok
e
n && chains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
difftool:
h
an
d
l
e
unmer
g
ed files in
dir-diff mo
d
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
D
a
v
id Ag
u
ilar
difftool: init
i
alize v
a
riables
for readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguilar
mergetool: h
o
nor tempfile conf
i
guration wh
e
n resolving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David
Aguilar
mergetool: s
u
pport d
e
lete/delete
con
f
licts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
Davi
d
A
g
u
i
lar
diffto
o
l: ignore symbolic links
in use_w
t
_fil
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David Aguilar
contri
b
/subtree: ign
o
re l
o
g
.
d
at
e
configu
r
ation
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
D
a
vid Agui
l
ar
merge
t
ools:
ad
d
winmerge as
a
builti
n
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
Da
v
id
A
guilar
m
e
rgetool--lib:
set
I
FS
for difftool and mergetool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
av
i
d
A
g
u
ilar
m
e
r
geto
o
ls: s
t
op
s
ettin
g
$status in merge
_
cmd()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
m
ergetool: simplify condi
t
ionals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguila
r
difftool--hel
p
er:
a
d
d
e
x
plicit exit
s
tatement
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
merge
t
ool--lib: rem
o
ve
use of $
s
tat
u
s global
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David Agui
l
a
r
difftool: honor --trust-ex
i
t-code for b
u
i
l
tin t
o
ols
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
Davi
d
A
guilar
difftool: add s
u
pport
for --t
r
u
s
t-exit-co
d
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
i
d Ag
u
ila
r
t7610-m
e
rgetool: ad
d
test
c
ases
for merge
t
ool
.
writeToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id
Aguilar
me
r
getool:
add an optio
n
for wr
i
ting t
o
a temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetool: use more conservative temporary file
n
ames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Aguilar
test-lib-functions: adjust style to ma
t
ch Codin
g
Guideline
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
Ag
u
ilar
t7610-mergetool: use test_config to isolate test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
Aguilar
mergetools/meld
:
ma
k
e usa
g
e of `--output`
configurab
l
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
git
-
sh-setup: mov
e
GIT_DIR initialization into a
f
u
n
ction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
mergeto
o
l: use
m
o
re conservative temporary fil
e
names
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
test-lib-
f
un
c
ti
o
ns: adjust style to matc
h
CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid Aguilar
t76
1
0-mergetool: prefer
test_co
n
fi
g
o
v
er git
c
o
nfig
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguilar
t7610-merg
e
tool: add
m
issing && a
n
d
r
emov
e
comme
n
ted
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Ag
u
ilar
t7610
-
mergetool:
u
se tabs ins
t
ead of
a
m
ix of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Aguilar
completio
n
:
a
dd --show-signa
t
ure
for
log and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
s
tash: prefer
--quiet over shell redir
e
ction of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Davi
d
Agui
l
ar
r
efs: make rev-pa
r
se --quiet actually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
Davi
d
A
gu
i
l
ar
t1503: us
e
test
_
must
_
be
_
empt
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguila
r
Documentation: a no
t
e abou
t
stdout for git rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Agu
i
lar
cleanups: ens
u
r
e
th
a
t g
i
t
-
c
o
mp
a
t-util
.
h is included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
Da
v
id Aguilar
st
y
lefix: as
t
e
r
i
s
ks st
i
ck t
o
the variab
l
e, not th
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
Da
v
id Aguilar
gitk: Catch mkdtemp
errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk: Use m
k
t
emp -d t
o
avoid pre
d
ictable temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
g
i
t
k: Honor TMPDIR
when viewing externa
l
diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Aguilar
difftool:
s
u
ppo
r
t reposito
r
ies with
.
git-fil
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
p
ull: add --ff-onl
y
to the help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull: add p
u
ll
.
ff configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
D
a
vid Aguilar
imap-
s
e
n
d: eli
m
i
n
ate
H
MAC deprecation
w
ar
n
ings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Da
v
id Aguilar
cache
.
h: elim
i
n
a
te
S
H
A
-1
d
e
pre
c
a
tion warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
Makefile: add suppor
t
for Apple C
o
mmonC
r
ypto facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
Dav
i
d Agui
l
ar
Makefile: fi
x
de
f
ault reg
e
x setti
n
gs on Darwi
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
D
avid
A
guilar
m
e
rget
o
ols/kd
i
ff3: do
n
ot use -
-
auto
w
h
en diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Agui
l
ar
help
.
c
: add a compa
t
i
b
ility comment
t
o cmd_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
co
n
trib/
m
w
-to-git
/
t/in
s
tall
-
wiki
.
sh: use
a lowerc
a
se
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
uilar
contr
i
b
/
e
x
a
m
p
les/git-
r
emote
.
perl: use
a lower
c
ase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
tests: use a lowerca
s
e "us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avid Aguilar
git-svn: use a lowercase "usage:" str
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
Documentation/user-manual
.
txt: u
s
e a low
e
rcase "
u
sage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
templates/hooks-
-
update
.
sa
m
p
le
:
use
a
lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
contrib/hooks/setgitperms
.
perl: u
s
e
a
lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d
Aguilar
c
o
n
trib/exampl
e
s: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
contrib/fast-import/i
m
p
ort-zi
p
s
.
py: use spaces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
contr
i
b/f
a
st
-
impo
r
t/imp
o
rt-zips
.
p
y
: fix br
o
ken error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
cont
r
ib/fast-im
p
or
t
: use
a
lo
w
e
rca
s
e "us
a
ge:" st
r
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id
Ag
u
i
lar
contr
i
b/cre
d
e
n
tial: use a
lowercase "usag
e
:
"
stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
git-cvsimpo
r
t
:
use a lowercase "usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid A
g
uila
r
git
-
cvsim
p
ort:
use a lowercase "usage
:
" str
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
l
a
r
git-cvsex
p
o
rtcommit: use a lower
c
ase "usa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
gi
t
-archimpo
r
t: use a lowe
r
c
a
s
e
"
u
s
age:"
s
tr
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git-
m
erge-one-file:
use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
u
i
lar
g
i
t-relink:
u
s
e a
l
owercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Ag
u
ilar
g
it-svn:
u
s
e a
l
owercase "us
a
ge:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
g
it-sh-s
e
tu
p
:
u
se a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
a
vid Agu
i
lar
t
7
8
0
0: "defa
u
lts" is no longer a
b
uiltin too
l
name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Ag
u
ilar
t
7
800: mode
r
nize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David
A
g
u
il
a
r
t7
8
00:
u
pdate copyright noti
c
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Ag
u
ilar
dif
f
t
o
ol: si
l
ence uninitialized varia
b
le
w
arning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Agui
l
ar
p4merge: fix p
r
in
t
f us
a
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
avid A
g
u
i
lar
difftool
-
-helper:
fix
printf us
a
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
avid Aguilar
doc:
generate
a list of vali
d
m
erge too
l
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
v
id A
g
uilar
mer
g
e
t
ool--lib: add functions f
o
r fin
d
i
ng availa
b
le
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
A
g
u
il
a
r
merge
t
ool-
-
lib: improve the
help text in guess_merge
_
tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Aguilar
mer
g
etool--lib: simplify
c
omma
n
d expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
A
gui
l
ar
mer
g
etools: simpli
f
y how
w
e han
d
le "vim" an
d
"de
f
aults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David A
g
uilar
me
r
getool--lib: improve show_t
o
o
l
_help() out
p
u
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David
Aguilar
merget
o
ols
/
vim: remove redu
n
dan
t
di
f
f c
o
mma
n
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next