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
Merge branch 'jk/remote-helper-with-signed-tags'
2013-04-16
David Aguilar
h
e
lp
.
c: add
a compa
t
ibility com
m
en
t
to cmd_versi
o
n()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguila
r
con
t
rib
/
mw-to-gi
t
/
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
Aguilar
con
t
r
i
b
/
e
xamples/
g
it-remot
e
.
perl: u
s
e a lowercas
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguil
a
r
tests:
u
se a lo
w
er
c
ase "us
a
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
v
id
A
guilar
gi
t
-sv
n
:
use a
l
ow
e
r
case "usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
Docume
n
ta
t
i
o
n
/user-
m
anual
.
t
x
t: use a
l
owercase "u
s
age
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
tem
p
lates
/
hooks--u
p
da
t
e
.
sample
:
u
s
e
a lowe
r
case "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id
Agu
i
lar
contrib/hook
s
/setgitperms
.
perl: use a l
o
wer
c
ase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contri
b
/examp
l
e
s: use
a
l
o
wercase "usage
:
"
str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
c
o
n
trib/
f
a
st-import/import-zips
.
p
y
:
u
se spaces instea
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
c
o
n
t
r
ib/fa
s
t-
i
m
p
ort/
i
mport-
z
ips
.
p
y
:
f
ix
broken error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
co
n
t
r
ib
/
fast-impo
r
t:
u
se a lowercase "usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
Aguila
r
contrib/cre
d
ential: u
s
e a lower
c
ase "usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id
A
guilar
git-cvsimport: use a lowe
r
cas
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
git-cvsimp
o
rt: use a low
e
rcase
"usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
gi
t
-cvsexp
o
rtcom
m
it: use a
l
o
w
e
r
c
ase "usage:" s
t
ri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
git-archim
p
or
t
: use a lowercase "u
s
a
ge:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-me
r
g
e-one-file: use a lo
w
ercase "usage:" s
t
rin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d Agui
l
a
r
git-relink: u
s
e
a
lowercase "usage:"
s
trin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
git-sv
n
:
u
se a lowercas
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
g
it
-
s
h-
s
e
tup:
u
se a
l
o
we
r
case "usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Da
v
id
Aguilar
t7800: "defaults" is no
l
o
n
ger a builtin too
l
name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Davi
d
Aguilar
t
7
800
:
moder
n
ize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
Davi
d
Aguilar
t78
0
0: update copyright noti
c
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
Dav
i
d Aguilar
difftoo
l
: silence uninitialized variable
w
arning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Davi
d
Agu
i
lar
p4merge: fix p
r
intf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Davi
d
Aguilar
difftool
-
-
h
elper: fix
pri
n
tf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
avid A
g
u
i
lar
d
oc: generate
a
l
ist of
val
i
d me
r
g
e t
o
ols
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David A
g
u
ilar
mergetool--lib:
add funct
i
ons for
finding available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d
Aguilar
mergetool--lib: impro
v
e the hel
p
text
in g
u
e
s
s_merge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id Aguilar
me
r
getool
-
-lib: simplify c
o
mmand expressi
o
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetools: s
i
m
plify
h
ow we h
a
ndl
e
"
v
i
m"
a
nd "
d
efaul
t
s"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid
Agu
i
lar
mergetool--li
b
: imp
r
ove show_tool_help() ou
t
p
ut
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Agu
i
lar
mergetools/vim: remove
redundant di
f
f command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
Davi
d
Aguila
r
merge
t
ools/p4merge
:
Hono
r
$TMPDIR fo
r
the /dev
/
null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
Dav
i
d
Aguilar
me
r
get
o
ols/p4mer
g
e: Handle "/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
m
e
r
getool--lib:
All
o
w cu
s
tom comm
a
nd
s
to ove
r
ride built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguil
a
r
g
i
tk: Rename 'tagcon
t
e
nts' to 'cached_
t
agconten
t
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David
Aguilar
gitk: T
e
ach "R
e
rea
d
refer
e
nces" to reload
t
ags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Davi
d
A
g
uilar
mergetool,difftool: Document
--tool-help c
o
n
s
isten
t
ly
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Agui
l
ar
difftool:
Disa
b
le --symlinks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Ag
u
i
l
a
r
difftoo
l
: Han
d
le compare()
r
eturning -
1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Aguilar
difftoo
l
:
Wr
a
p
long l
i
nes for r
e
adability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Agu
i
lar
d
ifftool: Ch
e
ck
a
ll
return c
o
de
s
fr
o
m compa
r
e()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool
:
Handle finding mergetools/ i
n
a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Use symlinks
w
hen diffing agai
n
st the w
o
rktre
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id
A
g
uil
a
r
difftoo
l
: Call the t
e
mp directo
r
y "git-di
f
ftoo
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
i
l
ar
di
f
f
t
o
o
l
: Mov
e
option values into a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
d
i
fftool: E
l
iminate gl
o
bal vari
a
bles
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguil
a
r
d
i
f
ftool: Sim
p
lify p
r
int
_
tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800: Test difftool passing arguments to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
m
e
r
g
etoo
l
:
Provi
d
e an em
p
ty file when ne
e
de
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makefile:
I
m
prov
e
compiler header d
e
penden
c
y check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Agu
i
lar
mergetools/mel
d
: U
s
e
'--outp
u
t' when availa
b
le
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
m
e
rge
t
ool--lib: Refactor t
o
o
ls in
t
o separate f
i
les
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
av
i
d Agu
i
lar
mergetool--lib: Make style consisten
t
with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
diffto
o
l--
h
elper:
M
ake
s
tyle c
o
nsistent
w
ith
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Ag
u
ilar
t/t7503-pre-commit-hook
.
sh:
A
dd G
I
T
_
P
REFIX tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
A
gu
i
lar
git-mer
g
etool--lib:
Make vimdif
f
retai
n
t
he current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
g
i
t: Rem
o
ve han
d
ling for GIT
_
PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
v
i
d Aguilar
s
etup: Prov
i
d
e
GI
T
_P
R
EFIX
t
o bui
l
t-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodul
e
sync
:
Updat
e
"
s
ub
m
odule
.
<name>
.
u
r
l"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
D
avi
d
Aguilar
mergeto
o
l:
Skip auto
r
es
o
lved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Dav
i
d
Aguilar
Documentation: Explain gi
t
-merget
o
o
l
'
s u
s
e of tempor
a
ry
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David
Aguilar
Ma
k
efil
e
: Remove usage of dep
r
eca
t
ed Pyt
h
on "has_k
e
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: Fix '
-
-gui' whe
n
d
iff
.
gu
i
tool
i
s unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800-
d
ifftool
.
sh:
Test
mer
g
etoo
l
.
p
r
o
mpt
fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
D
avi
d
Agui
l
ar
difftool
:
Update copyright n
o
tices to li
s
t each
y
ear
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
i
f
ftool: Use ev
a
l
t
o
expand '--extcmd' express
i
ons
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
A
guil
a
r
dif
f
tool: Add '-
x
'
and a
s
an alias for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguilar
t7800-difft
o
ol
.
s
h
:
S
im
p
lify the --ex
t
c
md te
s
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
lar
git-diff
.
t
x
t
:
Li
n
k to
git-difftoo
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguilar
diff
t
oo
l
: All
o
w s
p
ecifying unconfigured commands wi
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d
A
guilar
difftool--helper: R
e
move use of the GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
v
id Aguilar
diffto
o
l--helper: Update
c
opyright an
d
remove d
i
st
r
acti
n
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id Aguilar
g
it-diff
t
ool: Add '--
g
ui
'
f
o
r selectin
g
a GUI
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t
7800-difftool: Set a bogus
to
o
l
fo
r
use
b
y tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
Da
v
i
d Aguilar
help: Do not
unne
c
e
s
s
arily look for a
reposi
t
o
ry
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David
A
guilar
subm
o
d
u
le
.
c
:
Squ
e
lch a "use before assignm
e
n
t" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Ag
u
ilar
diff
:
generate pret
t
y
f
ilena
m
es in
prep_temp_blob
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguila
r
compat:
a
dd a bas
e
name() compa
t
ibilit
y
funct
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat:
add a mkstemp
s
() compatibi
l
i
t
y
func
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
Add
g
it
-
replace to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
Da
v
i
d
Aguila
r
mergetool--lib:
a
d
d
suppo
r
t f
o
r araxis merg
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David
A
guilar
mergetool--l
i
b: specialize
d
iff optio
n
s for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David
Aguila
r
m
e
rgetool--lib: si
m
plify API usage b
y
remov
i
ng more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguil
a
r
diff
t
ool/mergeto
o
l: refactor commands to use git-merget
o
ol
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
m
e
rget
o
o
l: use $(
.
.
.
) instead of `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ila
r
bash
comple
t
ion: add g
i
t-dif
f
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
difftool
:
add
s
u
p
port
f
or a dif
f
t
o
o
l
.
pr
o
m
p
t config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
difftool: add various git-difftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
dif
f
tool:
m
ove 'git-difftool' o
u
t of cont
r
ib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
ool
:
a
dd a -y s
h
o
r
t
cut fo
r
--no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Agui
l
ar
difftool: use perl
built
-
ins when
t
es
t
ing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: remove the
ba
c
kup file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftool: remove merge o
p
ti
o
ns
for o
p
en
d
iff, tkdi
f
f
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Dav
i
d A
g
uilar
every
d
ay
:
use the dashless form
o
f
git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Agu
i
lar
contrib/di
f
ftool: use
a
s
e
parate config namespace f
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
c
o
ntr
i
b/d
i
fftool
:
D
on't repeat merge tool c
a
ndidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Agu
i
lar
d
i
ff
t
ool: put the cursor on t
h
e
edita
b
l
e
f
i
l
e f
o
r
Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next