repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
config.c: fix mmap leak when writing config
2014-11-14
David Agu
i
lar
difftool
:
honor --trust-ex
i
t-c
o
de for builtin tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
Dav
i
d Agu
i
la
r
difftool: add
s
u
pp
o
r
t
for -
-
t
r
ust-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
v
id Aguilar
t7610-mergetool: add te
s
t cases f
o
r
me
r
g
etool
.
w
r
i
t
eToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Aguilar
mer
g
etool: add an opti
o
n for writ
i
ng to a tem
p
orary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetoo
l
:
use more conservative
t
e
mporary filenam
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguila
r
test-lib-functions:
adjust
s
tyle t
o
mat
c
h CodingGuidel
i
nes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t
7
6
10-merge
t
o
o
l: use
te
s
t_confi
g
to
i
s
olate tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetool
s
/meld: make usage of `--
o
utput` configura
b
le
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
g
i
t-s
h
-s
e
tup: move GIT_DIR initialization into a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
merg
e
tool: use more
c
o
n
servative
t
emporary fi
l
enames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid Agui
l
ar
test-lib-functions: adjust styl
e
to match Cod
i
ngGuid
e
lines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Ag
u
ilar
t
7610-mergetool: prefer tes
t
_config over git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguilar
t
7
6
1
0-m
e
rgetool: add mis
s
ing &&
and
remove commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
A
g
uilar
t7
6
10-
m
er
g
etool: use tabs instead of
a
m
i
x of
t
abs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David
Ag
u
ilar
completion: a
d
d
--sho
w
-signature for log and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David
Agui
l
ar
stash: prefer --quiet over shell r
e
direc
t
i
o
n of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
refs: make rev-parse
-
-quiet act
u
ally quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Aguilar
t1503: use t
e
st
_
mu
s
t_be
_
empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
D
av
i
d Ag
u
i
l
ar
D
ocu
m
entati
o
n:
a
note about stdout for git rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
D
a
v
i
d A
g
uilar
c
le
a
nups: ensure
that git-c
o
mpat-util
.
h is i
n
cluded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David Aguilar
stylefix: asterisks stick to the variable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David
A
g
ui
l
ar
git
k
:
Catch mkdtemp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Davi
d
Aguilar
gitk:
U
se mktemp
-
d
t
o avoid
p
redictable
temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
av
i
d
A
gu
i
lar
gitk: Honor TM
P
DIR when viewing
ext
e
rnal diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Da
v
id
A
gu
i
lar
diff
t
o
ol: support repos
i
tori
e
s with
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull
:
add --ff-only to
t
he help
text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pu
l
l
:
add pull
.
ff configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
D
avid
A
guil
a
r
imap-send: elimin
a
te HMA
C
d
eprec
a
t
ion w
a
rnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Dav
i
d
Aguilar
cache
.
h: eliminate
S
HA-1 deprecat
i
on warnings o
n
Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Da
v
id Aguilar
M
akefil
e
: ad
d
support
for Apple CommonCrypto facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
Davi
d
Aguilar
Makefile: fi
x
default
regex settings on
Da
r
wi
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David
Aguila
r
m
e
r
getools/kdiff3: do not use --a
u
t
o when
d
i
f
fing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
Da
v
id
A
guil
a
r
help
.
c: add a compatibility comment to cmd
_
version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d
Aguilar
co
n
trib/mw
-
to-git/
t
/
install-wiki
.
sh: use a l
o
wercas
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
Agu
i
lar
c
ontrib/examples/git-remote
.
perl: us
e
a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
tests
:
use a
l
owercase "u
s
a
ge
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Agu
i
l
a
r
git-svn: us
e
a l
o
we
r
case
"
us
a
ge:" s
t
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
Documentation/use
r
-manual
.
tx
t
: use a lowercase
"
u
sage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
t
empl
a
t
e
s/hooks--
u
pdate
.
sa
m
p
le: use a lowercase "usag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
contrib
/
hooks/set
g
itperms
.
perl: u
s
e
a
l
owerc
a
s
e "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
contrib/examples: use
a l
o
we
r
case "usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
Agu
i
l
ar
co
n
t
rib/fast-imp
o
rt/import-zi
p
s
.
py: use
s
pa
c
es
inste
a
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
contrib/fast-
i
mport/import-zips
.
py: fix broken e
r
ror
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
uilar
contrib/fast-import: use a lo
w
ercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
contrib/cred
e
ntial: use
a
low
e
rcas
e
"
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsi
m
port: use a lowerca
s
e "us
a
ge
:
" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
git
-
cvsimport: use a lowercase "usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
git-cvsexportco
m
mit: use a lo
w
er
c
ase "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
git-archi
m
port: use a
lowercase "usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
A
gui
l
ar
git-m
e
rge-
o
ne-
f
ile: use a lowerc
a
s
e
"u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
git-relin
k
: us
e
a
l
o
w
e
rcas
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid A
g
uilar
git-svn: use
a l
o
wercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
g
it-s
h
-setu
p
: use
a
lo
w
ercase "us
a
ge:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
a
v
id Aguilar
t7800: "
d
efaults"
i
s no lo
n
ger a built
i
n tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: m
o
derni
z
e tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Aguilar
t7800: upd
a
te copyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguila
r
difftool:
s
ilenc
e
un
i
niti
a
lized va
r
iable
w
arni
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4merge: fix pr
i
n
t
f
usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid Aguilar
difftool--he
l
per: fi
x
p
r
in
t
f usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
A
gu
i
lar
doc: generate a l
i
st o
f
val
i
d merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Da
v
id Aguilar
mergetool--lib:
a
dd function
s
for
f
i
nding av
a
ilab
l
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David A
g
uilar
merget
o
ol--li
b
:
improve the he
l
p text in gu
e
ss_merge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
Aguilar
merget
o
ol-
-
lib: simpl
i
fy c
o
mmand ex
p
ress
i
o
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguila
r
me
r
getools:
s
im
p
lify
how we
h
andle "vim" a
n
d "de
f
aults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Agu
i
lar
me
r
g
etool
-
-li
b
:
improv
e
s
h
ow_tool_help() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David
Aguilar
merget
o
ols/vim:
r
emov
e
redundant diff
com
m
and
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
Da
v
id
A
guilar
mergetools/p4me
r
g
e
: Honor
$
TMPDIR for t
h
e
/
d
e
v
/
nul
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
Da
v
id
A
guilar
mer
g
etool
s
/
p
4merge: Handle "/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Agui
l
a
r
me
r
getool--lib: Allow cus
t
om
c
ommands to overri
d
e built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
avid Ag
u
i
l
ar
gitk: Rename 'tagcontents' to 'ca
c
hed_
t
ag
c
ontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d Aguilar
gitk: Teach "Re
r
ead
references" to reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Davi
d
Aguilar
m
e
rgeto
o
l,
d
ifftool: Docum
e
nt --to
o
l-help
c
onsi
s
tently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id Aguilar
d
i
f
f
tool: Disable --s
y
mlinks o
n
cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
dif
f
tool
:
Han
d
le c
o
mpare() r
e
turn
i
ng -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Aguilar
difft
o
ol:
W
rap long lines for r
e
adability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
diff
t
ool: Check
all
return codes f
r
o
m
co
m
pare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
avid Aguilar
difftool: Hand
l
e
f
inding
m
e
r
getools/ in a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
difftool: Use symlinks when
d
iffing
a
gai
n
st the worktre
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d
Aguilar
difftool: Call the temp
directory
"
git-diff
t
ool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguila
r
difft
o
ol: Move o
p
tion values into a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
ar
difftool: Elimina
t
e glob
a
l
variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: S
i
m
p
lif
y
print_to
o
l_
h
elp()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t
7800:
T
e
s
t dif
f
t
oo
l
p
a
ssing argumen
t
s to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
D
avid
Aguilar
mergeto
o
l:
P
r
ovide an e
m
pty
file w
h
en needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
Davi
d
Aguilar
Mak
e
file: Impr
o
ve compiler
header dependency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
Aguilar
mergetools/
m
eld
:
Use '--
o
utput'
wh
e
n availab
l
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
me
r
g
e
tool--lib: Refa
c
tor to
o
ls
i
nto sepa
r
ate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergeto
o
l--li
b
: Make style consiste
n
t
w
i
t
h git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
u
i
la
r
difftool--
h
elper: Mak
e
style con
s
istent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Agui
l
ar
t/t750
3
-
p
re-commit
-
h
ook
.
s
h
:
A
dd GIT_PRE
F
IX tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Aguila
r
git
-
mer
g
etool--li
b
: Make vimdiff retain t
h
e current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vi
d
Aguilar
git: Remove ha
n
dling fo
r
GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setu
p
: Provide GIT_PREFIX
t
o
bui
l
t-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Davi
d
A
g
uilar
su
b
module s
y
nc: Update "sub
m
odule
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
Da
v
id Aguilar
mergetool: Skip autoresolved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
D
a
vid Aguilar
Documen
t
ation: Expla
i
n
git-merg
e
tool's use of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Ag
u
ilar
Mak
e
fi
l
e: Remove usage
o
f deprecated Pyt
h
o
n "
h
as_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David
Ag
u
ilar
di
f
ftool: Fix '-
-
g
u
i
' whe
n
diff
.
guitool is
u
nconfi
g
ured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Dav
i
d
Aguilar
t7800
-
difftool
.
sh: Test mer
g
etool
.
promp
t
fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David
A
guilar
difftool: Update copyrigh
t
n
otices to list each
year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next