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
templates/hooks--update.sample: use a lowercase "usage:" string
2013-02-24
David
Agui
l
ar
tem
p
lates/hooks--upda
t
e
.
s
a
mple: use a lowe
r
case "
u
sage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguila
r
c
o
nt
r
ib/hooks/setgitperms
.
pe
r
l: use a
l
owercase "us
a
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
Aguilar
contrib/examples: use a low
e
rcase "usage:" st
r
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
contrib/fas
t
-import/import-zi
p
s
.
py:
use space
s
i
nstead
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contr
i
b/fast-i
m
port/impor
t
-zips
.
py: fix bro
k
en
e
r
r
or
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
av
i
d Aguilar
contrib/fast-import: use
a
lowe
r
case "usa
g
e:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/
c
rede
n
tial: use a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
git-cvsimport: use a lo
w
er
c
ase
"usage
:
" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
gi
t
-cvsimp
o
rt: us
e
a
lowercase "u
s
age
:
" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Agu
i
lar
gi
t
-cvsexportcommit
:
use
a lowercase
"
usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguila
r
git-archimport:
use a l
o
wercase "u
s
ag
e
:"
s
t
r
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguil
a
r
git
-
m
e
r
ge-one-file: u
s
e
a lowercase "usage:"
st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
g
i
t-re
l
ink: use
a
lowerc
a
se
"us
a
g
e:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
git-
s
v
n
:
u
se
a lowerca
s
e "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguil
a
r
g
it
-
sh-setup: use a l
o
wercas
e
"usage:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p
4merg
e
:
fix printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
avid
A
guilar
di
f
ftool--helpe
r
:
f
ix printf
us
a
ge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
avid
A
guilar
doc: gen
e
rate a list of vali
d
merge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
Da
v
id Aguila
r
merg
e
t
o
o
l
-
-
lib: add f
u
nction
s
for finding avai
l
able
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Aguilar
me
r
getool-
-
lib:
i
mprove the 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
u
ilar
merge
t
ool--lib: simplify co
m
mand e
x
pressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetools:
simplify how we h
a
n
d
le "vim" and
"
defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Da
v
id A
g
uilar
m
erg
e
tool
-
-lib: improve s
h
o
w
_tool_help() output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David
Aguilar
m
ergetoo
l
s/vim:
remove redu
n
dant d
i
ff
c
ommand
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
D
a
vid Aguilar
mergeto
o
l
s/p4merge: H
o
nor
$TMP
D
IR
for
t
he /de
v
/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David
Aguilar
m
e
rgetools/p4merge:
H
a
ndle "/dev
/
nul
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
m
e
rgetool--
l
ib: Allow cu
s
tom com
m
ands t
o
ov
e
rride built-
i
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Renam
e
'tagco
n
tents' to 'cached_ta
g
content'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Teach
"
Reread refer
e
nces" to rel
o
ad tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David
A
guilar
mergetool,difftool: Document --tool-help consistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David
A
gui
l
ar
difftool: Disabl
e
--sym
l
i
n
ks on
cy
g
w
i
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
a
v
id Agui
l
ar
difftool: Handle c
o
mpare() returning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David
A
guilar
difftool: Wrap long lines for readability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difft
o
o
l: Check a
l
l
r
e
t
u
r
n codes from compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
diff
t
ool: Handl
e
f
inding merget
o
o
ls/
i
n a p
a
th w
i
th
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
a
r
difftool: Use
symli
n
ks wh
e
n
di
f
fi
n
g against the worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
i
lar
difftool: Call th
e
temp
d
i
r
ectory "git-d
i
ff
t
oo
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
ar
diff
t
ool: Move option values
into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
difftool: Elimi
n
ate gl
o
bal vari
a
ble
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
di
f
ftool:
S
implify pri
n
t
_
tool_help(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
D
a
v
id Aguilar
t7800: Te
s
t
d
ifftool pa
s
s
i
ng ar
g
uments
to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
D
a
v
i
d
Aguilar
merget
o
ol:
P
rovide
an empt
y
fi
l
e when
needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
Davi
d
A
g
uilar
Make
f
ile: Improve c
o
mpiler header dependency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguilar
mergetools/
m
eld: Use '--output'
w
hen a
v
a
ilable
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguilar
me
r
getool--lib: Ref
a
ctor tools into separate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
ui
l
ar
merge
t
ool--lib: Make style
c
o
nsi
s
tent with g
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
difftool--
h
elper: Ma
k
e style
co
n
si
s
ten
t
w
ith git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Agui
l
ar
t/t75
0
3
-pre-commit-hook
.
sh: Add GIT_PR
E
F
IX test
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David
Aguilar
g
it-merget
o
ol--lib: Mak
e
v
imdiff re
t
ai
n
th
e
c
u
rrent
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: Remove handling for GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
a
v
i
d
A
g
u
i
lar
setup:
P
rovide GIT_PREFIX to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Dav
i
d
Agu
i
lar
submodule
s
ync:
U
pdate "submo
d
u
l
e
.
<na
m
e
>
.
ur
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
Davi
d
Aguilar
mergetoo
l
: Skip
a
u
t
oresolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
D
ocumentation: Ex
p
lain git-merget
o
ol's us
e
of tempor
a
ry
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
D
avid Agui
l
ar
Makefil
e
: Remo
v
e us
a
ge
of deprec
a
ted
Python "
h
a
s_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
d
ifft
o
o
l
: Fix '--gui' when d
i
f
f
.
guitool is
uncon
f
igure
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
Da
v
i
d Aguilar
t7
8
00-diff
t
o
o
l
.
sh: Test mer
g
etool
.
p
r
ompt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difftool: Update copy
r
ight notices
t
o list e
a
c
h year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d A
g
u
ilar
difftool: Us
e
e
v
al
to expa
n
d
'
--ext
c
md' expre
s
s
i
ons
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
ui
l
a
r
diff
t
ool: Ad
d
'-
x
'
and
as an alias for '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uilar
t7800-
d
ifftool
.
sh:
S
i
mplif
y
t
h
e --
e
x
t
cmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-diff
.
txt: Link to git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
di
f
ftool: A
l
low
specifying unconfigured commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
d
i
fftoo
l
--helper: Remove use of the GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguila
r
diff
t
ool--
h
elper: U
p
date copyright and
r
emo
v
e
distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
avid Aguilar
git-dif
f
t
o
ol: Add
'
-
-gui' fo
r
selecting a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
avid
Agui
l
ar
t
7800-diff
t
ool
:
Set a
b
o
g
u
s
tool for use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Ag
u
ilar
help: Do not unn
e
cessarily look for a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
Davi
d
Aguil
a
r
submo
d
ule
.
c: Squelch a "use befo
r
e
ass
i
gnment" warnin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
lar
diff: gen
e
rate pretty filenames in prep_te
m
p
_
blob
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguila
r
com
p
at: add a b
a
sen
a
me() compatibilit
y
function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
comp
a
t: add a
mkst
e
mps()
c
ompa
t
ibi
l
ity functi
o
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add git-repla
c
e to
.
g
i
tignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Agu
i
lar
merget
o
ol
-
-lib: add suppo
r
t for a
r
axis mer
g
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David
Aguila
r
m
e
r
getool--lib: specialize
diff o
p
tions for em
e
r
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
avid Aguilar
merget
o
ol--lib: simplify
API usage by removin
g
mor
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ftool/mergeto
o
l
: refactor commands to use git-mer
g
etool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
merget
o
ol: use $(
.
.
.
)
instead of `bac
k
ticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
b
a
sh completion: add git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
difftool:
a
dd supp
o
rt for a difftoo
l
.
promp
t
con
f
ig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftoo
l
:
add various git
-
difftool t
e
sts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguila
r
difftool: mo
v
e 'gi
t
-
d
iff
t
ool'
o
ut
of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Agu
i
la
r
d
if
f
t
o
ol:
ad
d
a -
y
s
h
ortcut for --no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id
Aguilar
difft
o
ol: use
p
erl built
-
in
s
whe
n
testing for m
s
y
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
d
i
fftool: remove
the bac
k
up file fe
a
ture
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
difftool: remove merge options for
ope
n
diff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David A
g
uilar
every
d
ay: use the dash
l
ess form
o
f git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Ag
u
ilar
c
o
ntrib/difft
o
ol: use a sep
a
ra
t
e config nam
e
spac
e
for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Aguil
a
r
contrib
/
difftool
:
Don't
repe
a
t merge tool c
a
ndidate
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguil
a
r
d
i
fftool
:
put the cur
s
o
r on the editable file for
V
im
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
vid Aguilar
d
ifft
o
ol
:
fix documentat
i
on p
r
oblem
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
D
avid A
g
u
i
la
r
contrib: add 'git
diff
t
ool' for
l
aunching common merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
g
i
t
-mergetool:
properly handle
"
git merget
o
ol -- fi
l
ename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
Dav
i
d
Ag
u
ilar
tests
:
add a
t
estcase
f
or "git su
b
mo
d
ul
e
sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
Davi
d
Aguil
a
r
git-
s
ub
m
odu
l
e: add "s
y
nc"
c
omma
n
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
Davi
d
Aguilar
gi
t
-submodule: replace dupl
i
cated cod
e
with a module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
Dav
i
d Aguilar
[
PATCH] gitk: Don't show loca
l
c
han
g
es when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree