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
stylefix: asterisks stick to the variable, not the type
2014-09-02
David Aguilar
s
tylefix: asteris
k
s stick to the variable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David A
g
uilar
gitk: Catch mkdtemp er
r
or
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
avid Agu
i
lar
gitk: Use mktemp -d to
avoid
p
redictable temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Da
v
id A
g
ui
l
ar
gitk: Hon
o
r TMPDIR w
h
e
n
vi
e
wing extern
a
l diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Dav
i
d
A
guilar
difftool: suppo
r
t reposi
t
o
r
i
es
w
i
t
h
.
g
i
t
-
files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Da
v
id Aguilar
pull: add --ff-only to th
e
help t
e
xt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Dav
i
d
A
guil
a
r
p
u
ll:
add p
u
ll
.
f
f
configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
D
a
vid Aguila
r
imap-
s
end: eliminate HM
A
C deprecation w
a
rn
i
ngs o
n
Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Davi
d
Agu
i
l
ar
c
a
che
.
h:
el
i
minate SHA-1 deprecatio
n
warni
n
gs
o
n M
a
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Da
v
id
A
guila
r
Makefile:
add
sup
p
ort for Appl
e
Comm
o
n
Cry
p
to
f
a
ci
l
i
ty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
D
av
i
d
Aguilar
Ma
k
e
f
ile: fix default
reg
e
x
s
e
tt
i
ng
s
on Darw
i
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
D
avid A
g
uilar
mer
g
e
tools/kdiff
3
: do not
use --
a
uto w
h
en diff
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Aguila
r
help
.
c:
add
a
compatibility comment to cmd_ve
r
sion()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguila
r
contrib/mw-to-git/t/insta
l
l-wiki
.
sh:
u
s
e a
l
o
w
e
r
case
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguil
a
r
contrib
/
examp
l
es/gi
t
-
r
emo
t
e
.
perl:
use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Ag
u
ilar
t
e
sts: use a lowercase
"usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avid Aguilar
git-svn: use a lowercase
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
Documentati
o
n/user-ma
n
ual
.
txt: us
e
a
lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
temp
l
a
tes/
h
o
oks
-
-updat
e
.
sam
p
le: use a
l
owercase "usag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/h
o
oks/setgitp
e
rms
.
perl: u
s
e a lowercase "us
a
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
contrib/ex
a
m
ples: use
a
lowerca
s
e "us
a
ge:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
A
gu
i
lar
contri
b
/fast-import/import
-
zips
.
py: use spaces
i
ns
t
ead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-impor
t
/import-zips
.
py:
f
ix brok
e
n
error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
contrib/fast-i
m
po
r
t:
u
se
a
lowerca
s
e "usage:" s
t
rin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
o
ntrib/
c
reden
t
i
a
l:
u
se a lowercase
"usag
e
:
"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid
A
gui
l
ar
g
i
t-cvsimport: use a lowercase "
u
sage:"
s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-c
v
simport: us
e
a
lo
w
er
c
ase "u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
u
ilar
git-cvsexport
c
ommi
t
:
u
se a lowercase
"
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-ar
c
himport
:
use a lowercase
"usage:"
s
tr
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Agu
i
lar
git-merg
e
-one-fi
l
e
:
u
s
e a
l
owercase "usa
g
e:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git
-
relink: use a lo
w
erca
s
e
"usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
Aguilar
g
i
t-sv
n
: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
uilar
gi
t
-sh-set
u
p: use a lowercase "usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David
Aguilar
t7800: "defaults"
is no longer a
b
uiltin tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Da
v
id Aguilar
t7800: modernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David A
g
uilar
t
7800: upda
t
e co
p
yright no
t
ice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
difftool: silence uninitialized variable warnin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Agui
l
ar
p4merge:
f
ix pr
i
ntf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Agu
i
lar
diffto
o
l--helper: fi
x
printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
doc: g
e
ne
r
a
t
e a list o
f
valid merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
Ag
u
i
l
a
r
mergetool--l
i
b:
a
dd functions for finding available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id Aguilar
mergetoo
l
--lib:
impro
v
e the he
l
p text in guess_
m
erge_too
l
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
avid Aguila
r
mergetool-
-
lib
:
simpl
i
fy comma
n
d
expression
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetools
:
simp
l
ify how we
h
andle "vim"
and
"
defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Davi
d
A
guilar
mergetoo
l
--lib: improve sho
w
_
t
ool_help() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
avid
A
guil
a
r
mergetools/vim: r
e
move r
e
dundan
t
diff co
m
mand
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
D
a
vid Aguilar
mergetools
/
p4mer
g
e: Honor $
T
MPDIR for t
h
e /dev/nul
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
D
avid Aguila
r
merget
o
ol
s
/p4merge: Handle
"/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
D
avid Aguilar
merg
e
tool--lib: Allow cu
s
tom commands to
o
verride
built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Re
n
am
e
'tagcontents
'
to 'cac
h
ed_
t
agconten
t
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vid Aguil
a
r
gitk:
Teach "Rer
e
a
d
references" to reload
ta
g
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David
A
guilar
merge
t
ool,difftool:
D
ocument --tool-help c
o
nsistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Agu
i
lar
difftool: Disable --syml
i
nks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
d
i
f
ft
o
ol: Handle comp
a
re(
)
ret
u
rning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Ag
u
il
a
r
di
f
ftool:
W
r
a
p long lines for readabili
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
a
vid Ag
u
ilar
difftool: Ch
e
ck all re
t
urn cod
e
s fr
o
m c
o
m
pare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Agui
l
ar
difftool: Handle f
i
nding merget
o
ols/ in a
path wi
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Use
symlinks when diffing
a
gainst the work
t
ree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguil
a
r
difftoo
l
: C
a
ll th
e
t
e
mp
d
ir
e
ctory "git-diffto
o
l"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
id Aguilar
difftool
:
Mov
e
option values
into a has
h
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
fft
o
ol: Eli
m
inate global var
i
a
b
les
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
dif
f
tool: Simplify print_too
l
_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800: Test difftool pass
i
ng a
r
guments to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
Dav
i
d Agui
l
ar
merget
o
ol
:
Provide an empty file when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
Da
v
id Aguilar
Makefile: Improve compiler header
d
e
p
ende
n
c
y
c
h
e
ck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid
A
guilar
merget
o
ols/meld: Use '-
-
outp
u
t'
wh
e
n availabl
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Aguila
r
mer
g
etool--
l
ib: Refactor
t
o
o
ls i
n
t
o separate fil
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--
l
ib: Make styl
e
consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
d
i
f
fto
o
l--help
e
r: Make style consistent w
i
th git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David 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
D
a
vid Ag
u
ilar
git-merg
e
too
l
--lib: Make
v
im
d
i
f
f
retain
t
he curr
e
nt
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Aguilar
g
it: Remo
v
e handl
i
ng for
G
IT_PR
E
F
IX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
uil
a
r
setup: Provide GIT_PREFIX to b
u
ilt
-
ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Da
v
i
d A
g
uilar
submo
d
ule sync: U
p
da
t
e "submodul
e
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
Da
v
id
A
g
u
i
l
ar
mergetool: Skip autoresolved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David A
g
uilar
Documentation: Expl
a
in git-mergetool's use of t
e
mporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Ma
k
efile: R
e
move usage of depr
e
cated Python
"
has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David A
g
u
i
l
a
r
diff
t
ool: F
i
x '--gui' when diff
.
guit
o
o
l is unconfigu
r
ed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Dav
i
d
Agui
l
ar
t7800-
d
if
f
tool
.
sh:
T
est mergetool
.
prompt
f
allback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
d
ifftool:
Upd
a
te copyright notices to list each
ye
a
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguilar
difftool: Us
e
eval
t
o e
x
pand '--extcm
d
'
e
xpres
s
ions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Agui
l
ar
d
i
fft
o
ol: Add '-x' and as an alias for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t
7
800-difftoo
l
.
sh: S
i
mplify th
e
-
-extcm
d
test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
A
g
u
ilar
g
it-diff
.
tx
t
: L
i
n
k to git-d
i
fftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
di
f
f
tool: Allo
w
spec
i
fying un
c
onfigured commands
with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid A
g
u
il
a
r
diff
t
oo
l
--hel
p
er: R
e
m
ove use of th
e
GIT_MERGE_
T
OOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Agu
i
lar
difftool--helper: Update copyri
g
h
t
and remove distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
Aguilar
git
-
d
ifftool: A
d
d '--gui' fo
r
select
i
ng a
GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguil
a
r
t7800-diffto
o
l: Set a
b
o
g
us tool
f
or use
by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
Davi
d
Aguilar
help: Do
n
o
t
unnecessarily look for a
re
p
ository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
Dav
i
d Aguilar
submodule
.
c:
Squelch a
"use be
f
or
e
as
s
ignment"
w
arning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
diff: generate pret
t
y filenames in prep_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
c
ompat: ad
d
a
basename() com
p
a
t
i
b
ility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
A
g
uilar
comp
a
t: add a mkstemps() compatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
v
i
d
A
g
uilar
A
dd git-re
p
lace to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Ag
u
ilar
me
r
g
e
t
o
ol--lib:
a
dd suppo
r
t
for ar
a
xis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
D
avid Ag
u
ilar
m
e
rgetool--lib: specialize diff option
s
f
o
r
emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
Dav
i
d A
g
ui
l
a
r
mergeto
o
l--l
i
b:
s
imp
l
ify API
u
sag
e
by r
e
moving more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
difftool/merge
t
ool
:
refactor co
m
mands
to use
g
i
t-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
merge
t
ool: use $(
.
.
.
)
instead of
`
backt
i
cks
`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next