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
grep: remove redundant REG_NEWLINE when compiling fixed regex
2017-06-19
David Agu
i
lar
mergetools/meld: improv
e
compatibiilty with Meld on
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
D
a
vid Aguila
r
diffto
o
l:
h
a
n
dle modified symlinks in dir-
d
iff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David Aguilar
t7800:
cleanup cruft left behind b
y
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David Aguilar
t7800: remov
e
whitespace b
e
fo
r
e re
d
ire
c
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
Dav
i
d Aguilar
t7800: replace "wc -l" wit
h
test_line_co
u
nt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
Da
v
id Aguilar
t7800:
s
i
m
plif
y
ba
s
ic usage test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-06
D
a
v
i
d Aguilar
difftool: fix bug when p
r
inting us
a
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-01-18
David
A
guilar
gi
t
k: Remove tra
n
slated message
f
rom comments
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Agu
i
l
a
r
merg
e
tools: fix x
x
diff hotkeys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
a
v
id
A
gu
i
lar
difftool:
rename variables
f
or consis
t
ency
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
diff
t
ool: chdir as ea
r
ly a
s
poss
i
ble
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguila
r
difftool: sanitize $workdir as early
a
s
po
s
sible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David
Aguilar
difftool: fix dir-diff
i
n
d
ex
c
reation when in a subdirectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
David A
g
uil
a
r
di
f
ftool: fix dir-diff index creatio
n
whe
n
in a subdirectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
Da
v
id Aguilar
merg
e
too
l
s/vim
d
iff: t
r
ust Vim's exit code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David A
g
uila
r
m
e
rgetool: honor merge
t
ool
.
$
t
ool
.
trustExitC
o
de for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
m
e
rgetool: honor -O<or
d
e
r
f
ile>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David
Aguilar
mergetool:
h
onor
diff
.
o
rderFile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
mergetool: mo
v
e main
prog
r
am flow i
n
t
o
a main() funct
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
m
e
r
getool:
a
dd copyright
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
difftool
:
u
s
e
Git::*
f
unctions
inst
e
ad of passing arou
n
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Agui
l
a
r
diffto
o
l: avoid $GIT_DIR an
d
$GI
T
_WORK_TREE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David
A
guilar
su
b
tr
e
e:
a
djus
t
fu
n
ction definition
s
to match CodingGui
d
eline
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David
A
guila
r
subtree:
adjust style to
match CodingG
u
idelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Aguil
a
r
su
b
t
r
ee: fix "git
s
u
b
tree sp
l
it --rejoin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Dav
i
d Ag
u
ila
r
t7
9
00
-
subt
r
ee
.
s
h
: fix quoting a
n
d
bro
k
en && chains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
difftool: hand
l
e
u
nmerged 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 Agu
i
l
a
r
difftool: initializ
e
var
i
able
s
for
reada
b
i
l
i
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguil
a
r
m
erg
e
tool: honor tempfile configurat
i
on wh
e
n
resol
v
ing
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
D
a
vi
d
Ag
u
i
l
a
r
me
r
get
o
ol: su
p
p
o
rt del
e
te
/
delete
c
onflicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
David Ag
u
ilar
difftool: igno
r
e symbolic links
i
n
u
se_wt
_
fi
l
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David Aguilar
contr
i
b
/
s
ubtr
e
e
: ignor
e
lo
g
.
date configurat
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David A
g
uil
a
r
mergetools
:
add w
i
nmerge as a
built
i
n tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Agui
l
ar
mergetool--l
i
b
: se
t
IF
S
for difftool and mergetool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Davi
d
Aguilar
m
e
rgetools:
stop settin
g
$status in mer
g
e
_
cmd(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguil
a
r
me
r
g
etool: simp
l
ify conditiona
l
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
d
i
fftoo
l
--
h
elper: add explici
t
exit s
t
a
temen
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
mergetool--li
b
: re
m
ove use of $
s
tatus global
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David
Ag
u
ilar
di
f
fto
o
l: honor
--trus
t
-exit-code
f
or bu
i
ltin to
o
l
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
D
avid Agu
i
lar
difftoo
l
:
a
dd support
for
-
-
t
r
ust-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id Aguilar
t7610-me
r
g
etool: add
t
e
s
t c
a
ses
for mergetool
.
writ
e
ToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
Aguilar
me
r
ge
t
ool: add a
n
option f
o
r writing to
a
temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
v
id Aguil
a
r
merget
o
ol: use more conservative temporar
y
fi
l
enames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id Aguilar
t
est-lib-functions
:
adjust style to match Coding
G
uidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguil
a
r
t7610-merg
e
tool: use test_config to isolate tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agui
l
a
r
m
e
rgetools/meld: mak
e
usage of `
-
-output` c
o
nfigurab
l
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Agui
l
ar
g
i
t-sh-setup: move
G
IT_
D
IR initialization in
t
o
a
func
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agu
i
lar
mergetool: us
e
more conserva
t
ive tempo
r
ary filena
m
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
tes
t
-lib-functi
o
ns: adjust style
t
o ma
t
ch Cod
i
ngGu
i
deli
n
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David A
g
uilar
t
7610
-
merget
o
ol: prefer
test_config ove
r
git conf
i
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7
6
10
-
mergetool: ad
d
mis
s
ing
&
& and remove commen
t
ed
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d
A
gu
i
la
r
t7610-mergetool: us
e
tabs instead o
f
a
mix of ta
b
s
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
Dav
i
d
A
gui
l
ar
c
o
m
p
l
etion: add --show
-
sign
a
ture for log an
d
show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
sta
s
h: pref
e
r --quie
t
o
v
e
r
shell re
d
ir
e
c
t
io
n
o
f
the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
refs: make rev-pa
r
se
--qu
i
et actually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
D
a
vid Aguilar
t1503: u
s
e
t
est_must_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Davi
d
Ag
u
ilar
Documentation: a note about stdout f
o
r git rev-pars
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguila
r
cleanups: ensure that
g
i
t-compat
-
u
t
il
.
h
i
s
inc
l
uded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
Dav
i
d Aguilar
s
t
ylefix: aste
r
i
sks
s
tick to the
v
ariable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
D
a
vid Agu
i
lar
gitk
:
C
a
tch mkdt
e
mp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Da
v
i
d
Aguilar
gi
t
k: Use mktem
p
-
d
to
avoi
d
predi
c
table tempora
r
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguila
r
gitk: Hono
r
TMPDIR when
viewing external diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Aguilar
dif
f
tool:
s
uppor
t
reposito
r
ies
w
it
h
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David
A
guilar
pul
l
: add --ff-
o
n
l
y t
o
the
h
e
l
p te
x
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Dav
i
d
A
guilar
pu
l
l:
add pul
l
.
ff
configurat
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
imap-send:
eliminate HMAC de
p
rec
a
tion warning
s
o
n
Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
cac
h
e
.
h: eliminat
e
S
HA-1 deprec
a
tion w
a
rnings on
M
ac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Dav
i
d Aguilar
Makef
i
le: ad
d
s
u
pport for Apple CommonCrypto facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
D
a
vid
Aguil
a
r
Make
f
ile: fix default regex settin
g
s on Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
Dav
i
d Aguilar
mergetoo
l
s/kdif
f
3: d
o
not use --auto when diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Aguilar
help
.
c: ad
d
a
compa
t
ibilit
y
comment to cmd_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Agui
l
ar
contrib/
m
w-to-git/t/install-wiki
.
sh: use
a
lowe
r
case
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguila
r
contrib/exa
m
ple
s
/g
i
t-remo
t
e
.
perl:
u
s
e a
l
o
wercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
tests: use a lowercase "usage
:
"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
Agu
i
l
ar
git
-
svn: use a lowerca
s
e "usage:" s
t
ri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
Documentation/user-manual
.
txt: use a lo
w
e
rca
s
e
"
us
a
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
A
g
uilar
templates/hooks--upda
t
e
.
sam
p
le: use a lowerc
a
s
e "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uil
a
r
c
o
n
tr
i
b
/
h
o
ok
s
/s
e
tg
i
tper
m
s
.
p
erl:
u
se a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
contrib/ex
a
mp
l
es: use
a
l
o
wercase "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d Aguilar
contrib/fast-im
p
ort/i
m
po
r
t-z
i
ps
.
py:
use sp
a
ces
i
nstead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast
-
import/impor
t
-zips
.
p
y: f
i
x
broken e
r
ror
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
c
o
n
t
rib/fast-import:
u
s
e
a low
e
rcase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/credential: use a lowercase "us
a
ge:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Agu
i
la
r
git-cvs
i
mport
:
use a
low
e
rcase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git
-
c
v
simp
o
r
t
: use
a
lowercase "u
s
age:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d Aguilar
git-cvsexportcommi
t
:
us
e
a
lowercase
"
usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
A
g
uilar
git-
a
rchimpo
r
t
: us
e
a lower
c
a
s
e "usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
g
i
t-merge-one-file: use a lower
c
ase "usag
e
:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
git-relink: use a
l
owercase "us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-sv
n
: use a l
o
wercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it-sh-setu
p
: use
a
low
e
rcase "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Dav
i
d Aguilar
t
780
0
: "defaults
"
is no longe
r
a
b
uiltin tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: modern
i
ze test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
Dav
i
d Aguilar
t7800: u
p
d
a
te cop
y
righ
t
not
i
ce
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
D
a
vid
A
guilar
difftool
:
silence uninit
i
al
i
zed vari
a
ble warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4merge: fix p
r
intf us
a
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David A
g
uilar
dif
f
tool--helper: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Agu
i
lar
doc:
g
e
n
erate a list of
val
i
d
merge to
o
ls
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
A
guil
a
r
me
r
getool--lib: add
funct
i
ons for f
i
nding availabl
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id Aguilar
me
r
ge
t
ool--lib: improve the help text
i
n guess_
m
e
r
ge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next