repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool: honor --trust-exit-code for builtin tools
2014-11-14
David Aguila
r
di
f
ftool:
h
onor --trust-exit-
c
ode for builtin tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-28
David A
g
uilar
diff
t
ool:
ad
d
supp
o
r
t
f
o
r --trust-ex
i
t
-code
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-27
David Aguilar
gi
t
k: Cat
c
h mkdtemp errors
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
David Ag
u
ilar
gitk: Use mktemp -d
t
o avoid
predictable tempora
r
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
David Aguila
r
g
itk: Honor
TMPDIR
when viewing exte
r
na
l
diff
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-02-24
David Aguilar
d
i
fft
o
ol: suppo
r
t repositories w
i
th
.
git-fi
l
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
Davi
d
Agu
i
lar
pull: add --ff-only
t
o th
e
help text
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
Dav
i
d Aguilar
pull: add pu
l
l
.
ff configuration
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
imap-send: eliminate HMAC deprecation warnings on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
David Ag
u
il
a
r
c
ache
.
h
:
eliminate SHA-1
d
eprecation warnings on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
David A
g
u
i
l
ar
Makefile: add support for Apple CommonCryp
t
o facility
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-11
D
av
i
d
A
guilar
Make
f
ile: fix defa
u
lt regex setti
n
gs on Da
r
win
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-09
David Aguila
r
mergetools/kdif
f
3
: do not use --au
t
o
when dif
f
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-04-16
David Aguilar
help
.
c: add a compati
b
i
l
it
y
comment
t
o cmd_versio
n
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
c
o
ntrib/mw-to-
g
it/t/in
s
tall-wi
k
i
.
sh
:
u
se a
l
owercase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David
A
guila
r
contrib/examples/git-remote
.
perl: use a lower
c
ase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David
A
g
uilar
t
ests: use a low
e
r
c
ase "usage:" s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
u
ilar
git-svn: us
e
a lowerca
s
e
"usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
i
l
ar
Documen
t
ation/user-man
u
al
.
txt:
u
se a
l
owercase "us
a
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguila
r
t
emplates/hooks--update
.
sample: use a l
o
w
erca
s
e "u
s
age
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
cont
r
ib/h
o
o
k
s
/setg
i
t
p
erm
s
.
pe
r
l: use
a
lo
w
er
c
ase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid A
g
u
ilar
c
ontrib
/
e
xamples: use
a
lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id Aguilar
c
ontrib/
f
a
s
t
-import/import-zips
.
py: use spaces inst
e
ad
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
contrib/fast-imp
o
r
t
/import-zi
p
s
.
py: fix broken error
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
contrib
/
fast-
i
mport: use a l
o
wercase "usage:"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
contrib/credential: use a low
e
rca
s
e
"usage:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
git-cvsimp
o
rt: use a
lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguil
a
r
g
i
t
-cv
s
import: use a
lo
w
ercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d
Agui
l
ar
git-cvsexportcommi
t
:
u
se a lowe
r
ca
s
e "u
s
ag
e
:
"
stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
uilar
git-archimport: use a l
o
we
r
ca
s
e
"usa
g
e:" strin
g
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 "
u
sage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git
-
re
l
ink: use a lo
w
e
rcase "u
s
age:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
gi
t
-
svn: use a lowercase
"usage:" s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id
A
guilar
git-sh-setup: use a lowe
r
c
a
se "us
a
g
e:" s
t
r
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
Da
v
id Aguil
a
r
t
7
800: "
d
e
f
a
u
lts" is no longer a b
u
ilt
i
n tool n
a
me
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
D
a
vid
A
guila
r
t7800: modernize tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
David Aguila
r
t78
0
0: update copyright notice
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
Dav
i
d
Agu
i
lar
difftool: s
i
l
e
nce uni
n
i
tialized
v
a
r
iabl
e
w
a
r
n
i
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
Dav
i
d Aguilar
p4merge:
fix
pr
i
ntf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid Ag
u
ilar
difftool--helper: fix printf
u
sage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
Davi
d
Aguilar
doc: ge
n
e
r
a
te a l
i
st of
valid
m
erge
t
ools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
avid Ag
u
i
lar
mergeto
o
l--lib: add functions
f
o
r
finding
available
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id Aguilar
me
r
getool--lib:
improve the
h
elp text
in
g
uess_
m
erge
_
tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
m
e
rgetool--lib: simpli
f
y command
expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
avid A
g
uilar
me
r
getools: simplify how we handle "v
i
m"
and "d
e
faults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Ag
u
ilar
mergetool-
-
li
b
: improv
e
show_tool_he
l
p() outp
u
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
m
er
g
et
o
ols/vi
m
:
r
emove
redu
n
dant diff command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David Aguil
a
r
me
r
get
o
ols/p4merge: Honor
$
T
M
PDI
R
for the /dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
Davi
d
Agu
i
lar
m
ergetools/p4merge: Ha
n
dle "/dev/n
u
l
l"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David
A
gui
l
ar
mergetool
-
-lib: Allow
c
ustom commands
t
o
ov
e
rride built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Agui
l
ar
gitk: Rename 'ta
g
contents'
to 'cached_ta
g
c
ontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d Agui
l
ar
gitk: Teach "
R
e
r
ead re
f
eren
c
es"
to reload t
a
gs
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David
A
g
u
ilar
merg
e
t
o
o
l
,
diff
t
oo
l
: D
o
c
u
ment --tool-help c
o
nsistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftoo
l
: Disa
b
le --symlin
k
s on c
y
gwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Han
d
le compare() ret
u
rning
-1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguil
a
r
diff
t
ool: Wrap
long li
n
e
s
for
r
e
a
dability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
D
a
vi
d
Ag
u
ilar
dif
f
tool: Check all return codes from compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
D
avid Agu
i
lar
difftool: Handle finding mergetools/
in a path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
avid
Aguilar
d
i
fftool: Use sy
m
lin
k
s when di
f
fi
n
g
against the
w
orktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
difftool: Call the temp directory "
g
it-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
dif
f
tool: Mo
v
e
option value
s
into a ha
s
h
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
difftool: E
l
imin
a
t
e
globa
l
variables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguila
r
dif
f
tool: Sim
p
lify print_too
l
_
help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David
Agu
i
lar
t7
8
0
0: Test difftool passing argument
s
to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
D
avid Aguilar
merge
t
ool: Provide an
e
m
pty f
i
le when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
Da
v
id Ag
u
ilar
Makefile:
I
mpro
v
e compiler header dependency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
A
gu
i
l
a
r
m
ergeto
o
ls/m
e
ld: Us
e
'--output' when avail
a
ble
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Agu
i
lar
mergetool--lib: Refactor
t
ools into sep
a
rate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mer
g
etoo
l
--li
b
: Make style consi
s
tent
w
ith git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uilar
difftool--hel
p
er:
M
ake st
y
le co
n
si
s
tent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
Dav
i
d Aguilar
t/t7503-pre-commit-hook
.
sh: Add GIT_PREFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git
-
mergetool--l
i
b: Make vimdiff retai
n
the cur
r
ent
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
uilar
git: Remove handling for GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setup: Provide GIT_PREFIX to built
-
i
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David
A
g
u
ilar
s
u
bmodule sync: Upd
a
t
e "subm
o
d
ule
.
<na
m
e>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
Dav
i
d Aguilar
me
r
g
e
tool: Sk
i
p autoresolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David
Aguilar
Docum
e
ntati
o
n:
Explain gi
t
-m
e
rg
e
tool's
u
se
o
f
te
m
porary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Make
f
ile: Remo
v
e usage of deprecate
d
P
ython "has
_
key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
Dav
i
d Aguilar
diffto
o
l
: Fix
'
--g
u
i'
w
hen diff
.
guitool
is unconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguil
a
r
t7800-diffto
o
l
.
sh: Test merg
e
tool
.
p
r
ompt fall
b
ack
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David A
g
uilar
difftool:
U
pdate
copyright notices
to li
s
t each ye
a
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
avid
Aguilar
d
i
f
ftool: Use eval to expan
d
'--e
x
tcmd' exp
r
essi
o
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vi
d
Aguil
a
r
diff
t
ool
:
Add '
-
x'
and as an a
l
ias for '--ex
t
cmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
a
v
id Ag
u
ilar
t7800-di
f
ftool
.
sh: Simplify the
--extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
gi
t
-diff
.
t
x
t:
Link to gi
t
-d
i
fftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguilar
d
i
ffto
o
l:
A
ll
o
w specifying unconfigur
e
d commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Agui
l
ar
dif
f
tool--
h
e
l
per:
R
emove use
of the GIT_MERG
E
_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Ag
u
il
a
r
difftool--helper: Update copyright and
r
em
o
ve distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
av
i
d
Aguilar
g
i
t-di
f
ftool: Add '-
-
g
u
i'
f
or select
i
ng a GUI
t
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Ag
u
ilar
t
7800-diffto
o
l: Set a bogus to
o
l for use by
tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help: Do
no
t
unnecessarily look
f
or a
repos
i
tory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
Davi
d
Agu
i
l
ar
submod
u
le
.
c: Sq
u
elch a
"
use before ass
i
g
n
m
en
t
" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
uilar
diff
:
generate pretty filenames in prep_temp_blob(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agui
l
ar
compat: add a basename()
c
ompati
b
ility funct
i
on
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Agu
i
lar
compat: add a
m
kst
e
mp
s
()
compatibility f
u
nction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
i
d
Aguilar
Add git-replace
t
o
.
gitigno
r
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Agui
l
ar
m
erget
o
ol--lib: add supp
o
r
t
for
a
raxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
Da
v
i
d
Aguilar
mergetool--lib
:
sp
e
cia
l
ize diff options
for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergeto
o
l
-
-
lib: simplify
A
P
I
usage
by
r
em
o
ving more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
diffto
o
l/mergetool: refactor com
m
an
d
s to use git-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next