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: remove whitespace before redirect
2017-03-15
David Aguila
r
t7800: remo
v
e whitespace
before redirect
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
David Ag
u
ilar
t7800
:
replace "wc -l" with test_line_cou
n
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
David
A
guilar
t7800: simp
l
i
fy basic us
a
ge test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-06
Davi
d
Agui
l
ar
d
ifft
o
ol: fix bug when printing u
s
age
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
Davi
d
Aguilar
difftool: fix dir-
d
iff
index creatio
n
when in a subdirect
o
ry
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
Dav
i
d Aguilar
mergetool: honor
-O<
o
rderfi
l
e>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
D
a
vid Aguilar
m
e
rgetool: honor
d
iff
.
o
r
derFile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Agu
i
lar
merg
e
tool: move ma
i
n program flow into a main(
)
fu
n
ct
i
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
Da
v
id Aguila
r
mergetool:
a
dd copyright
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
d
i
fftoo
l
:
u
s
e
G
i
t::
*
func
t
ion
s
instea
d
of
p
a
s
sin
g
a
r
o
u
n
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Dav
i
d Agu
i
lar
difftool: avoid $G
I
T_DIR and $GIT_W
O
RK_TREE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Dav
i
d Aguilar
subtree: adjust function def
i
nitions to ma
t
ch CodingGuid
e
lines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Davi
d
Aguilar
subtree: a
d
jus
t
style to
m
at
c
h CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Aguil
a
r
subtree
:
fix "git subtree sp
l
it --rejoin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Davi
d
Aguilar
t7900-sub
t
r
ee
.
sh: fi
x
quoting
a
n
d
b
r
oken && chains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
D
a
vid Ag
u
il
a
r
difftool: ha
n
d
l
e
u
nme
r
ged fi
l
es in dir-diff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
Davi
d
A
gu
i
lar
d
i
fft
o
ol: i
n
itialize variables
f
o
r reada
b
ility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David
Aguilar
mergetool
:
honor tempfile c
o
nfigur
a
tion
w
hen resolv
i
ng
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguilar
m
ergetool
:
s
upport del
e
t
e/delete conflicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
Dav
i
d Aguilar
difftool: ig
n
ore symbolic link
s
i
n
u
se_
w
t_file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
Davi
d
Aguilar
contrib/s
u
btree: i
g
n
ore lo
g
.
date configuratio
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David
Aguilar
mer
g
e
t
o
o
ls: add winmerge
as
a builtin
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
mergetoo
l
--
l
i
b
:
s
et IFS for difftool and m
e
rgeto
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David
A
guilar
me
r
g
e
t
ools: stop set
t
ing
$status in mer
g
e_cmd()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Da
v
id Aguilar
m
ergetool:
simplify con
d
itio
n
al
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David
Aguilar
difftool--he
l
per: add explicit exit sta
t
ement
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
m
e
r
g
e
t
oo
l
--lib:
remov
e
u
s
e of $status global
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David Aguila
r
difftool:
h
o
n
or
-
-
trust-exit-code for builtin tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Agu
i
lar
d
i
fftool: add s
u
pport for --trust-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-mergetool: add test cas
e
s for mergetool
.
wri
t
eToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
Ag
u
ilar
mergetool: ad
d
an option fo
r
writin
g
to a tempor
a
ry
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid
A
guilar
mergetool:
use m
o
re conse
r
va
t
i
v
e
temporary
f
ilen
a
mes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agu
i
lar
test-li
b
-functions: ad
j
u
st style to match Cod
i
n
g
Guidel
i
n
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
Aguilar
t7
6
1
0-me
r
getool:
u
se test_config to isolate
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Ag
u
il
a
r
me
r
getools/meld:
make usage
of `--output` configurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
git-sh-setup: mov
e
G
I
T
_DIR initial
i
z
a
tion in
t
o a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid
A
guilar
m
ergeto
o
l
: use
m
ore conser
v
ative temporary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Aguilar
test-
l
ib-function
s
: adjust
s
tyle to match CodingGuideline
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguil
a
r
t7610
-
merg
e
too
l
:
pref
e
r test_conf
i
g ov
e
r git c
o
nfig
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Aguilar
t7610-merg
e
t
oo
l
: add missing && and re
m
ove commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-mergetool: use tabs ins
t
ead of a mix of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
Dav
i
d A
g
ui
l
ar
complet
i
on: add --show-sign
a
ture for log and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
D
avid
Agui
l
ar
stash: prefer --quiet ov
e
r shell redire
c
tion
o
f
t
he
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
r
efs: mak
e
r
e
v
-
parse --qu
i
et actually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
Dav
i
d Ag
u
ila
r
t1503:
use te
s
t_must_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Dav
i
d
A
gu
i
lar
Docu
m
enta
t
ion: a not
e
abo
u
t
s
tdout f
o
r
g
it rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
D
avid Agu
i
lar
c
lea
n
ups:
ensure that git-compat-u
t
i
l
.
h
is included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
D
avid Ag
u
i
l
ar
style
f
ix: asterisks stick to the variable, not
the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David Aguilar
gitk: Cat
c
h
m
k
d
temp err
o
rs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk: Use mktemp
-
d to avoid predictable te
m
porary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguil
a
r
g
i
tk: Hon
o
r TMPDIR when viewin
g
extern
a
l diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Aguilar
d
i
fftool: support repositories with
.
git-fi
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Ag
u
i
lar
pull:
add --ff-only
t
o the help
t
ext
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David
Ag
u
ilar
pull:
a
d
d
pull
.
ff
c
o
n
figu
r
ation
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
i
m
ap-send: eliminate HMA
C
deprecat
i
on warni
n
gs on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
cache
.
h
: e
l
iminate SHA-1 deprecati
o
n
w
ar
n
i
ngs on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
avid Aguilar
M
a
k
efile: add
sup
p
o
r
t
for Apple C
o
mmonCryp
t
o fa
c
i
l
ity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David A
g
uilar
Makefile: fix d
e
f
a
ult reg
e
x sett
i
n
g
s on Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Ag
u
ilar
mergeto
o
ls/kdiff3: do not
use --auto when
d
iffin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Agu
i
lar
help
.
c: add a compatibility comment to
c
md_ve
r
sion()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avid Aguilar
contrib/mw-to-g
i
t/t/inst
a
l
l-wiki
.
s
h
: use
a lower
c
as
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avid Ag
u
ilar
c
ontrib/
e
xamples/git-re
m
ote
.
p
erl: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
uilar
te
s
ts: u
s
e
a
lowercase
"
usage:"
s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Aguil
a
r
git-svn:
u
s
e a low
e
rcase
"usage:"
s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id A
g
uilar
Documentatio
n
/use
r
-
man
u
al
.
txt: use a
l
owercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
tem
p
lates/h
o
oks--upd
a
te
.
sample:
u
se a lowercas
e
"
u
sage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id Aguilar
con
t
rib/hooks/setgitpe
r
ms
.
p
e
rl:
use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avi
d
Aguila
r
contrib/
e
xampl
e
s
: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
contrib/fas
t
-import/i
m
por
t
-zips
.
py: use spa
c
es inst
e
ad
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
cont
r
ib
/
fast-impo
r
t/import-zips
.
py: fix broke
n
error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-import:
use a lo
w
ercase
"
usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
cont
r
ib/
c
redential: us
e
a lowe
r
ca
s
e "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-
c
vsimport: use
a
lowerc
a
se
"
u
s
a
g
e
:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d Aguilar
gi
t
-cvsimport: u
s
e a l
o
w
e
rcase "us
a
ge:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
u
ilar
gi
t
-
c
v
s
ex
p
ortcommit
:
use a lo
w
e
r
case "u
s
ag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
git-a
r
chim
p
ort: use a l
o
wercase
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Agui
l
ar
git-merge
-
one-file: use a lo
w
erca
s
e "usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-relin
k
: use
a
lower
c
ase "
u
sa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-
s
vn: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Agui
l
ar
git-sh-setup: use a
lower
c
ase
"usage:"
s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David A
g
uila
r
t
7
8
00:
"defau
l
ts"
i
s
no longer a b
u
iltin tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: moderni
z
e test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David A
g
uilar
t7800
:
u
pdat
e
c
o
pyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Ag
u
ilar
d
ifftool: silence uninitialized var
i
a
ble warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid Aguil
a
r
p4merge: fix printf
usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
d
i
f
f
too
l
--helper: fix printf
u
sage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguil
a
r
d
o
c: generate
a list o
f
va
l
i
d
merge
t
ools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
A
g
uilar
mergetool-
-
lib: add fu
n
ctions for finding
a
vail
a
bl
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
Aguilar
mer
g
e
to
o
l--lib: im
p
r
o
v
e the help
t
ext
i
n
g
uess_merge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool--lib: s
i
mplify
c
omma
n
d
expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
me
r
get
o
ols:
simplify how we ha
n
dl
e
"vim" and "defaults
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
m
ergetool--lib:
improve show_tool_hel
p
(
) outp
u
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Davi
d
Aguilar
mergetools/vim:
rem
o
ve redunda
n
t
dif
f
comma
n
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguil
a
r
mergetools
/
p4merge: Honor $TMPDIR for the
/dev/n
u
ll
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
Dav
i
d A
g
uilar
mergetools/p
4
merge:
H
andle "/dev/nul
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
D
a
v
i
d Aguilar
m
e
rgetool--lib: All
o
w
custom commands to overr
i
de bui
l
t-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Da
v
id Agu
i
l
ar
gitk: Rename '
t
agcon
t
ents' to 'c
a
ch
e
d
_tagcon
t
ent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguila
r
gitk: Teach "Reread referenc
e
s" to reload
t
ags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Dav
i
d
A
guilar
mergetool,difftool: Docu
m
ent --to
o
l-
h
elp consistent
l
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Aguilar
difftool: Disable --s
y
ml
i
nks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next