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
t7610-mergetool: add missing && and remove commented-out code
2014-10-15
Davi
d
Aguilar
t7610-mergetool: ad
d
mis
s
ing &
&
and
r
e
m
o
ve c
o
mmented
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David
A
guila
r
t7610-mergetool: use tab
s
instead
of a
mix of tabs
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-02-24
D
avid Aguila
r
difftool: sup
p
ort
repo
s
it
o
ries
w
i
t
h
.
g
it-files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
Da
v
id Aguilar
pull: add --ff-only
t
o the help text
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
Dav
i
d
Aguil
a
r
pu
l
l:
add p
u
ll
.
ff
configuration
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-21
David Agui
l
ar
imap-
s
end: eliminate HMAC deprec
a
tion warnings
o
n M
a
c
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
David
A
guilar
cache
.
h: eliminate SHA-1 deprecation
w
a
rnings on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
Da
v
i
d
Ag
u
i
l
ar
M
akef
i
le: add support for Apple CommonCryp
t
o faci
l
ity
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-11
Da
v
id Aguilar
Makefile: fix default regex settings
on D
a
rw
i
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
mergetools/k
d
iff3: do not use
-
-auto wh
e
n diffin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-04-16
David Agu
i
lar
help
.
c: add a
c
o
mpatibility
comment
t
o cm
d
_version(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
D
a
v
id Aguilar
contrib/mw-to-git/t/install-wiki
.
sh: use a
lower
c
ase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
D
a
v
id Aguilar
contrib/ex
a
m
pl
e
s
/g
i
t-
r
emote
.
perl: u
s
e a lowercase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguil
a
r
t
e
s
ts:
u
se a lowercase "usa
g
e:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David
A
guilar
git-svn
:
u
s
e a lower
c
ase "u
s
age:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
D
o
c
umen
t
ation/
u
ser-man
u
a
l
.
txt: use a lowercase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
te
m
plates/
h
o
oks--update
.
sampl
e
: use a
l
owercase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
c
o
ntrib/hook
s
/setgitperms
.
perl: use a
lowercase "usa
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
con
t
rib/examples:
u
se a lowercase "
u
sage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
contrib/fast-i
m
port/impor
t
-zips
.
py: use spaces instead
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-i
m
port/i
m
por
t
-zi
p
s
.
p
y
:
fix broken error
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
av
i
d Aguilar
contrib/fa
s
t-impor
t
: use a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
contrib/cr
e
dent
i
al:
use
a
l
owerc
a
se "
u
s
age:" s
t
r
in
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguila
r
git-cvsi
m
port: use
a
low
e
rcas
e
"
u
s
a
ge:" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Agui
l
ar
git-cv
s
i
m
po
r
t: use a lowerca
s
e "usage:" s
t
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
git-cvsexportco
m
mit: us
e
a
l
owercase "us
a
ge:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-
a
rchi
m
p
o
rt: u
s
e a lowe
r
cas
e
"usage:" s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
git
-
mer
g
e-
o
ne-file
:
use
a
lowercase "usage:" strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
A
gu
i
lar
g
it-rel
i
nk: use a lowercase
"
usa
g
e:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
u
i
lar
g
it-svn: use a lowercase
"usage:"
st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid A
g
uilar
git-sh-set
u
p
:
use a
l
owercase "usag
e
:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: "defaults" is no lon
g
er a buil
t
in to
o
l name
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
Da
v
id
A
g
uila
r
t7800: modernize tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
D
avid Aguilar
t7800: update copyright
n
otice
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
Davi
d
Aguila
r
difftool: silence uninitialized variable warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid Ag
u
ilar
p4merge: fix pri
n
tf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David
A
guilar
difftoo
l
--helper: fi
x
printf us
a
ge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
a
v
id Aguilar
doc: generate a lis
t
of va
l
id merg
e
to
o
ls
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguil
a
r
mer
g
etool--lib:
a
dd
functions fo
r
f
i
nding ava
i
la
b
l
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
avid Aguila
r
mergetool--lib:
i
m
p
rove t
h
e h
e
lp t
e
xt in guess_merge_tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David A
g
uilar
mergetool--
l
ib: sim
p
li
f
y
comm
a
nd expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id A
g
uilar
mergetools:
s
implif
y
h
ow
w
e h
a
ndle "vim
"
and "defa
u
lts"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Dav
i
d Aguil
a
r
mergetool--
l
ib: improve show_tool_help() output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Agu
i
lar
mergetools/vim:
remove redundan
t
di
f
f command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David Ag
u
ila
r
me
r
g
e
to
o
ls
/
p4mer
g
e: Honor $TMPDIR fo
r
the /dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David
Agui
l
a
r
mer
g
et
o
ols/p4merg
e
: H
a
ndle "
/
dev/nu
l
l"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Agui
l
ar
m
ergetool--lib: Allow cus
t
om comma
n
ds to
ove
r
r
i
de bu
i
lt-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
git
k
:
R
e
name 'tagcontents' to 'c
a
ched_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Agu
i
lar
git
k
:
Teach "Re
r
ead referen
c
es" t
o
r
e
loa
d
ta
g
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
mergetool
,
difftool:
Document
--tool-help
c
on
s
istent
l
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguila
r
difftool: Disable --s
y
mlink
s
on cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguila
r
difftool: Han
d
le com
p
are() returning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguila
r
difftoo
l
:
W
rap lon
g
lines for
readabi
l
it
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
D
a
vi
d
A
guilar
d
ifftool:
Check
a
l
l
return
codes from
c
o
m
pare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David A
g
uilar
difft
o
o
l: Handle find
i
ng mergetools/
i
n a
pat
h
wit
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guilar
difftool: Use symlinks when
diffing against the
w
orktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguilar
difftool: Call the temp directory "git-d
i
fftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
av
i
d Ag
u
i
lar
difftool
:
Move option
v
alues into a has
h
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
Ag
u
ila
r
diff
t
ool
:
Eliminat
e
g
lobal varia
b
l
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
difftool: Simp
l
ify
p
ri
n
t_tool_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David
A
guilar
t7800
:
Test
difftoo
l
pas
s
ing argu
m
ents to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
D
a
vid Aguilar
merget
o
ol: Provide an emp
t
y
fi
l
e wh
e
n needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David A
g
uilar
Makefi
l
e: I
m
pro
v
e compiler heade
r
dep
e
n
d
enc
y
check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
m
e
r
getools/meld: Use '--out
p
ut'
w
hen available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
A
guilar
mergeto
o
l--lib: Refactor tools into
s
e
parate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merget
o
o
l
--
l
ib: Make style consisten
t
with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Ag
u
ilar
di
f
fto
o
l--helper: M
a
ke
s
tyle c
o
n
s
is
t
ent
with gi
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
D
avid Ag
u
ilar
t/t7503-pre-commit-
h
ook
.
sh: Add GIT_P
R
EFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
a
v
id Ag
u
ilar
g
i
t
-
m
ergetool--
l
ib: Make vimdi
f
f retain the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: R
e
mo
v
e handling for GIT_P
R
EFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Agui
l
ar
setup:
P
ro
v
ide GIT_PREFIX to bu
i
lt-in
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David
A
g
uila
r
submodul
e
sync: Upd
a
te "sub
m
odule
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguila
r
mergetool: Skip auto
r
esolved
paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
D
o
cumentation: Explain gi
t
-merget
o
ol's use of
t
emporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
D
a
v
id Aguilar
Ma
k
e
f
i
l
e: Remove usage of
d
e
precat
e
d Pyt
h
on "has
_
ke
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: Fix '-
-
gu
i
' when
d
iff
.
gui
t
ool is unconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Agu
i
lar
t
7
800-di
f
ftool
.
sh: Test merget
o
ol
.
prompt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Agui
l
a
r
d
ifftool:
U
pd
a
te cop
y
rig
h
t not
i
ce
s
t
o
l
ist each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
ifftool:
U
se eval to exp
a
nd '--extcm
d
' expre
s
sions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
ilar
difftoo
l
: Add '-x' and a
s
an alias for '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agu
i
lar
t7800-d
i
fftool
.
sh: Simplify the
-
-extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
A
guila
r
git-dif
f
.
t
xt: Lin
k
to git-difft
o
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool
:
Allow spe
c
ifying unconfigu
r
ed c
o
mmands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
difftool--helper: Remove use of the
GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Agui
l
ar
difftool--helper: Upd
a
t
e
copyr
i
ght
and remo
v
e
distractin
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id Ag
u
ila
r
git-d
i
fftool:
Ad
d
'--gui' for selecting a
G
UI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David
A
gui
l
ar
t7800
-
di
f
f
tool: Set a bogus tool for use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Agui
l
a
r
h
elp: Do not un
n
e
c
essa
r
i
l
y look for a
repo
s
it
o
r
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David
Aguilar
submodule
.
c: Squelch a "use before assignment" warnin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
A
gu
i
lar
dif
f
:
g
e
n
erate
p
retty
fi
l
enames in prep_
t
e
m
p_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Agu
i
lar
compat: add a basen
a
me()
c
ompatib
i
lity
f
u
nction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
ilar
compat: add a
mkstemps() compat
i
bi
l
it
y
function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
i
d Aguilar
Add g
i
t-replace t
o
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
D
avid Aguilar
mergetool--lib
:
a
dd support for araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Agui
l
ar
mergeto
o
l
-
-lib: specialize
d
iff options for
e
merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David
A
guilar
mergetool--lib: simpl
i
fy API usage by rem
o
ving more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
dif
f
tool/m
e
rgeto
o
l: ref
a
ctor
c
o
m
m
ands t
o
us
e
git-
m
e
rgetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
m
ergetool: use $
(
.
.
.
) in
s
tead of
`
b
ackticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
bash completion: add git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
tool: add support for a diff
t
oo
l
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next