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
help.c: add a compatibility comment to cmd_version()
2013-04-16
Da
v
id Aguilar
help
.
c: a
d
d a compatibil
i
ty comme
n
t
t
o cmd_ve
r
si
o
n()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib/mw-to
-
git/t/instal
l
-
w
i
ki
.
sh: use a lowercas
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Ag
u
i
l
a
r
contrib/e
x
amples/git-remote
.
perl: use
a
l
owe
r
case
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id A
g
uilar
tests: use a
lower
c
ase "usage
:
" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguil
a
r
git-svn:
u
se a lo
w
ercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
Docume
n
t
a
t
i
on/user-manua
l
.
txt: use a l
o
wercase
"u
s
age
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
templates/hooks--up
d
ate
.
sampl
e
: use a
lowe
r
case "usag
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
cont
r
i
b
/h
o
oks/setg
i
tperms
.
perl: us
e
a
l
owercase "
u
sage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
contri
b
/examples: u
s
e a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-import/
i
mport-
z
ip
s
.
py:
u
s
e spa
c
es inst
e
ad
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/
f
ast-import/im
p
ort-
z
ips
.
py:
f
ix broken e
r
ror
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
gui
l
a
r
contri
b
/fast-import: use a lowercase "usage
:
" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
cont
r
ib/credential: us
e
a lowercase "usage:"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid A
g
uilar
gi
t
-cvsimport: use a lowercase "usage:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
Aguil
a
r
git
-
cvsimport: use a
lo
w
er
c
a
s
e "u
s
age:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsexportcommit: u
s
e a low
e
rcase
"us
a
ge:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Ag
u
ilar
g
i
t-archimp
o
r
t: us
e
a lowe
r
case "usage:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
git
-
merge-one-file: use a lowercase "usage:"
str
i
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
git-r
e
link: use a lower
c
ase "us
a
ge:"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
git-svn
:
use a
l
ow
e
rcase "
u
sage
:
" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
g
i
t-s
h
-setup: use a lower
c
ase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4merge: fix print
f
usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
difft
o
ol--helper: fix printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
d
oc: gener
a
te a list of
v
alid
m
e
r
ge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
Dav
i
d Aguilar
merget
o
ol--l
i
b: add f
u
nctions
f
o
r findi
n
g available
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
i
d
Aguilar
mergetool--lib:
i
mprove
the help text in gue
s
s_merge_tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David A
g
u
il
a
r
mergetool--lib: s
i
m
p
lify comm
a
nd expressio
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Ag
u
ilar
mergetools: s
i
mplify h
o
w we handle "vim" and "defaults
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David
A
gu
i
lar
mergeto
o
l--lib: improve show_tool_help
(
) out
p
ut
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Dav
i
d Aguilar
mergetools/vim: remove
redundant dif
f
command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
D
a
vid Aguilar
m
ergetools/p4merge: Ho
n
or $T
M
P
D
IR for the /d
e
v
/
nu
l
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David
A
guilar
m
e
rgetools/p4merge: Handle
"
/dev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
m
e
rgetool--lib:
Al
l
ow cu
s
t
o
m command
s
to override built
-
i
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Renam
e
'
t
agcontents' t
o
'
cached
_
tagcontent
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
avid Aguilar
g
i
tk
:
T
ea
c
h "Re
r
ead references"
t
o reload ta
g
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
D
avid Agui
l
a
r
mergeto
o
l,difftool: Document --tool-help cons
i
s
t
entl
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Ag
u
ilar
difft
o
o
l
:
D
isable
-
-s
y
mli
n
ks on cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid Aguilar
d
i
fftool: Hand
l
e compare()
r
eturni
n
g -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
uilar
d
i
f
f
tool: Wrap l
o
ng lines f
o
r
r
eadabil
i
ty
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
di
f
ftool:
Che
c
k all return codes f
r
o
m c
o
m
p
a
re()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: Handle
f
inding
m
er
g
et
o
ols/ in a
p
a
t
h with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
i
d
A
guilar
diff
t
ool: U
s
e
s
ymlinks wh
e
n
d
i
ffin
g
against the
w
ork
t
ree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
a
r
difftool
:
C
a
ll t
h
e
temp directo
r
y "git-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
difftool:
Move opt
i
o
n
value
s
i
nto
a
hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
u
i
l
ar
dif
f
to
o
l: El
i
minat
e
global varia
b
les
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
difft
o
ol: Simplify print_to
o
l
_
help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
D
a
vi
d
Agui
l
ar
t
780
0
:
Test diff
t
ool passing
arguments to d
i
ff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguila
r
merg
e
tool: Provide a
n
e
m
p
ty file w
h
e
n n
e
eded
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makefil
e
: Improve com
p
i
l
er header dependen
c
y c
h
eck
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merget
o
ols/meld: Use '--
o
utput' when available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
Ag
u
ilar
merge
t
ool--lib: Refactor tools in
t
o sep
a
rat
e
files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
m
e
rget
o
o
l
-
-lib: Make
style consis
t
e
n
t
with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avid A
g
uilar
difftool--helper: Make s
t
yle consiste
n
t with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
Dav
i
d
Aguilar
t
/t7503-
p
r
e-commit-hook
.
sh
:
Ad
d
GIT_PREFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David
A
guilar
git
-
me
r
getool--lib: Make vimdiff
r
etain the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguila
r
git: Remove handling fo
r
GIT_PRE
F
IX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David
Aguilar
setup:
P
r
o
vide GIT_P
R
EFIX to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David A
g
uilar
sub
m
o
d
ule sync: Update
"
submodule
.
<n
a
me>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
Dav
i
d Aguilar
mergetool: Skip autoresolved
paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
D
avi
d
Aguilar
Documentat
i
on: E
x
plain git-mergetool's use of
t
empo
r
ary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefile: Remove usage of deprecated Pytho
n
"
h
as_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
Davi
d
A
guilar
difft
o
ol: Fix
'
--gui' when diff
.
guitool is unconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800-difftool
.
sh: Test mergetool
.
pro
m
pt
f
allback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
di
f
ftool: Update c
o
pyright notices t
o
list
each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool: Use eval
t
o expand '--extcmd' e
x
p
r
ess
i
ons
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguila
r
difftool: Add '-
x
' a
n
d a
s
a
n
a
l
ias for '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguila
r
t7800-diffto
o
l
.
s
h: S
i
mplify the -
-
ex
t
cmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
A
g
u
ilar
git-diff
.
txt: Link to git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguilar
difftool: All
o
w sp
e
ci
f
y
i
n
g unconf
i
gu
r
e
d
commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
i
d
Aguilar
dif
f
too
l
--h
e
lper: Remove use o
f
t
he GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
difftool--helper: U
p
date copyright and remove di
s
tracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguil
a
r
git-difftool:
Add '
-
-gui'
f
or
s
electing a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
avid
A
guil
a
r
t7800-dif
f
too
l
:
S
et
a bo
g
us tool
f
or use by
tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David
Aguilar
help: Do not un
n
ecessarily look for a rep
o
sitory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
s
ubmodule
.
c
:
Squ
e
lch a "use before
assignment" w
a
rning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
ilar
diff: generate pretty filenames
i
n prep_temp_blob(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add a basename()
compat
i
bility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Ag
u
ila
r
compat:
add a mkstemp
s
() co
m
p
a
t
i
bility fu
n
ction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
Add g
i
t-replace to
.
g
i
tignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
merget
o
ol
-
-l
i
b:
add s
u
ppo
r
t
fo
r
araxis
m
erg
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
mergetool--lib: speciali
z
e
diff options for emer
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetool--lib:
s
implify
API usage by r
e
moving more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
di
f
fto
o
l
/
me
r
getool:
r
efactor commands to
u
s
e git-merg
e
tool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
mergetool
:
use $(
.
.
.
) instead o
f
`backti
c
k
s`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Ag
u
ilar
b
a
sh
c
omple
t
io
n
: ad
d
git-dif
f
tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
d
i
fftool: add support for a difftool
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: a
d
d var
i
ous git-difftool test
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftool: mo
v
e
'
git-difftoo
l
' out of co
n
t
rib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agui
l
ar
difftool: add a -y
s
h
ortcut for --no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
dif
f
t
oo
l
: use perl built-ins when testing fo
r
ms
y
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool:
r
emove the back
u
p
f
i
le feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
di
f
ftool: remove
m
erge opt
i
ons for opendif
f
, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
D
a
vid
A
g
u
ilar
eve
r
y
d
ay: use the
dashl
e
ss form of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
c
o
n
t
rib/difftoo
l
:
u
se a
s
eparate config namespace
for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
D
a
vid Ag
u
ilar
contrib/diff
t
ool
:
Don't repeat me
r
ge to
o
l
candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool: put the cur
s
or on the e
d
itable file for
Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Agu
i
l
a
r
difftool: fix documenta
t
ion problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David A
g
uilar
c
ontr
i
b
:
add
'
git d
i
f
ftool' fo
r
la
u
nching c
o
mmon
mer
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Agui
l
a
r
g
i
t
-mergetool: properly h
a
ndle "git
mergetool -- filen
a
me"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
Dav
i
d Ag
u
i
l
ar
tests: a
d
d a
testcase for "
g
it s
u
bmodu
l
e sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next