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
t7800: cleanup cruft left behind by tests
2017-03-15
D
a
v
i
d Aguila
r
t7
8
00: cleanup cruft le
f
t behind by
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
Davi
d
Aguilar
t7800: remov
e
whitespa
c
e
b
efore redir
e
ct
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
David Aguilar
t7
8
00
:
replace "w
c
-l" with
t
est_line_coun
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
Davi
d
A
gu
i
lar
t7800: simplify basic
usage test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-06
David Ag
u
ilar
difftool: fix bug when printing
u
s
a
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
Davi
d
Aguilar
difft
o
o
l: fix dir-
d
i
ff ind
e
x c
r
eatio
n
w
hen in
a
s
ubdirector
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
m
erge
t
o
ol: honor -O<orde
r
fi
l
e
>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Agu
i
lar
mergetoo
l
: honor d
i
ff
.
order
F
ile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
m
ergetool: mo
v
e
m
ain pro
g
ram flow into a main() fun
c
tion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Agui
l
a
r
mergetool: add co
p
yri
g
ht
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
diff
t
o
o
l
:
use Git::* f
u
nctions inst
e
ad of passing around
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
D
a
vid Agu
i
lar
difft
o
ol: av
o
id
$GIT_DIR an
d
$
GIT_WORK_TREE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David
A
gu
i
lar
subtree: adjust functio
n
d
efi
n
it
i
ons to match Co
d
ingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguil
a
r
subtre
e
: adjust style to
m
atch Cod
i
ngGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Dav
i
d Aguilar
s
u
btr
e
e:
fix "
g
it subtree spli
t
--rejoin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Davi
d
Aguilar
t7900-sub
t
ree
.
s
h:
fix quoti
n
g and b
r
oke
n
&
&
c
h
a
i
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
difft
o
ol:
h
a
n
dle u
n
m
erged fi
l
es in
d
ir-d
i
ff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
d
iff
t
o
o
l: initialize var
i
able
s
for read
a
bility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David
Aguilar
merget
o
ol:
h
onor tempfil
e
configuration
when resolving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
Davi
d
Aguila
r
m
ergetool
:
s
upport delete/delete conflicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
Davi
d
Aguil
a
r
d
if
f
tool: ign
o
re symbo
l
ic li
n
ks in use_wt_file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
Da
v
id Agu
i
lar
contrib/s
u
btree: igno
r
e log
.
date co
n
figurat
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David A
g
u
i
lar
mergetools:
a
d
d wi
n
merge as a builtin tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Ag
u
i
lar
merge
t
o
ol--li
b
:
s
et I
F
S for difftool and mergetool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David A
g
uilar
mergetools: st
o
p
s
etting $status in merge_
c
m
d
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David
A
g
uilar
m
erget
o
ol: si
m
plify cond
i
tionals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Dav
i
d Aguilar
difftool--h
e
lp
e
r: add exp
l
icit
e
x
it statement
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguila
r
merg
e
tool--lib:
r
emove use of
$st
a
tus global
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David Aguilar
d
ifftool: honor --tr
u
s
t
-exit-
c
ode for
b
uilt
i
n tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Aguilar
difftool: a
d
d supp
o
rt for --t
r
ust-exi
t
-co
d
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agu
i
lar
t
7610-
m
ergetool: add
tes
t
c
ases for mergetool
.
writ
e
ToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Aguilar
mergetool: ad
d
an option f
o
r writing to a
t
emporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
Aguilar
merge
t
ool:
u
se more cons
e
rvati
v
e
tempora
r
y filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
uilar
tes
t
-lib-functions: adjust style
t
o match
C
odin
g
G
u
ide
l
i
n
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
guilar
t
7610-mergeto
o
l: use t
e
st_con
f
ig to isolate tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agu
i
lar
m
e
rgetools/me
l
d:
m
ake usage o
f
`-
-
output
`
configur
a
b
le
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
git-sh-se
t
up: m
o
v
e GIT_DIR
initialization into a fun
c
tion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguilar
m
e
rgetool
:
use
more
conservative temp
o
rary filen
a
m
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguila
r
test-lib-func
t
i
ons: adjust style to match C
o
d
ing
G
u
idelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-me
r
getool:
p
r
efer test
_
confi
g
over gi
t
c
on
f
ig
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Aguilar
t761
0
-me
r
g
e
to
o
l: add
m
i
ssing &&
and remove
commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vid Aguil
a
r
t7610-mergetool
:
u
s
e
t
abs inst
e
ad
o
f a mix of
t
a
b
s
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Aguilar
completion: add --show-signature
f
o
r log and sh
o
w
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
stash: prefer --qui
e
t over
s
hell redirection of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Davi
d
Agui
l
a
r
refs: make rev-parse --quiet act
u
ally qu
i
e
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
Da
v
id Aguilar
t1503: use test_must
_
be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
D
ocumentation: a note
a
bout std
o
ut for git r
e
v
-
parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
D
avid
Aguilar
cle
a
nu
p
s: ensure
t
h
at git
-
compat-util
.
h is included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David Agu
i
lar
s
tylefix: asterisks stick to the variable
,
n
ot the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David Aguilar
gitk
:
Catch mkdtemp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Da
v
id Aguil
a
r
gitk: Use mkte
m
p -
d
t
o avoid predic
t
able te
m
por
a
ry
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
g
itk: Honor TM
P
DI
R
when vi
e
w
i
n
g
external diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Davi
d
A
g
uilar
d
i
fftool: supp
o
r
t
repositories with
.
git-fil
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
a
vid Aguilar
pull: add -
-
ff-only to th
e
h
e
lp t
e
xt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull: add
p
ull
.
ff
configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
Dav
i
d Aguilar
imap-send
:
eliminate
HMAC deprecation warnings on
M
ac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
cache
.
h
:
eliminate SHA-1 deprecati
o
n warnings on
M
a
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
Makefile: add supp
o
rt for
A
pple CommonCrypto facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
D
a
vid Ag
u
i
l
a
r
Makef
i
le:
f
ix
default regex sett
i
n
g
s on D
a
rwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David A
g
ui
l
a
r
merget
o
ols
/
kdiff3:
do not
u
se
--auto
w
h
en
d
if
f
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Ag
u
ilar
he
l
p
.
c: ad
d
a
co
m
patibi
l
ity commen
t
to cmd_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
c
o
ntrib/m
w
-to
-
git/t/inst
a
ll-wiki
.
sh: use a l
o
wercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib/examples/gi
t
-remote
.
perl
:
use a lo
w
ercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
uilar
tests: use a lowercase "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
A
guilar
git-
s
vn:
use a lowercase
"
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id A
g
uilar
Doc
u
mentation/user-manual
.
txt: use a
lowe
r
case "us
a
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
templat
e
s/hoo
k
s--
u
pda
t
e
.
sample: us
e
a l
o
w
e
r
c
ase "u
s
age
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
Aguila
r
contrib/h
o
o
k
s
/setgit
p
erms
.
perl
:
use
a
lowerc
a
se "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
con
t
rib/ex
a
mple
s
:
u
se a lowerc
a
se "usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
contrib/fas
t
-import/import-zip
s
.
py:
use spa
c
es
i
nste
a
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguila
r
contrib/fa
s
t-import/import-zips
.
py: fix broken
e
r
ror
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Agu
i
lar
c
ontrib/fas
t
-import: use a lowercase "
u
sa
g
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
i
l
ar
contrib/cr
e
dentia
l
: use a lowe
r
c
ase "usage:"
stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsimport: use a low
e
rcase
"
usag
e
:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
git-cvsimpor
t
: use a
lowercase "usage:" str
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Ag
u
ilar
g
it-cvsexpor
t
commi
t
: use a lowercase "usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
i
l
ar
g
i
t-ar
c
himp
o
rt: us
e
a lowerca
s
e "usa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-merge-o
n
e-fi
l
e: u
s
e a l
o
werca
s
e
"us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Ag
u
il
a
r
git
-
relink: u
s
e
a
lowercase
"usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
gi
t
-svn: use
a
lowerc
a
se "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
git-sh-setu
p
: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: "de
f
aults" is
n
o
lo
n
g
e
r
a
builtin tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: moder
n
i
z
e te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Aguilar
t7800: update copyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
D
avid Aguilar
difftool: silenc
e
un
i
nitiali
z
ed variable wa
r
ning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4merg
e
: fi
x
printf usa
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
avid Aguilar
d
i
fftool--helpe
r
: fix
p
r
i
n
tf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Davi
d
Aguilar
doc: g
e
nerate
a
list o
f
val
i
d mer
g
e tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
mergetool--
l
ib: add
functions
f
or finding a
v
ailable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
avid Aguil
a
r
mergeto
o
l--lib: improve the help text in gu
e
ss_merg
e
_tool(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguil
a
r
mergeto
o
l
--lib:
simplify command expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguila
r
mergetool
s
: simplify how w
e
handle
"
v
im" and
"defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mergetool--lib:
i
m
pr
o
ve show_tool_help(
)
outpu
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David A
g
uilar
mergeto
o
l
s
/vim: remo
v
e redundant d
i
ff c
o
mmand
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
me
r
getoo
l
s/p4merge: H
o
n
or $T
M
P
DIR for the /
d
ev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
D
a
v
id Aguilar
mergetoo
l
s
/
p4merge:
Handle
"/
d
e
v
/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David
Aguilar
mergetool--li
b
:
A
llow custom
comman
d
s to override built-in
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Da
v
id Aguila
r
gitk: Rename
'
tagcontents' to
'cached_ta
g
content'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vid
A
g
uilar
g
itk: Teach
"
Reread references" to relo
a
d tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
mergetool,difftool:
D
ocume
n
t --tool-h
e
lp consistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next