repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
contrib/fast-import/import-zips.py: fix broken error message
2013-02-24
David
A
guilar
contrib/fas
t
-i
m
port/im
p
ort-zips
.
py: fix broken er
r
or
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contri
b
/fast-impor
t
: us
e
a
lowe
r
case
"usag
e
:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
c
ontrib/cred
e
nt
i
al: use a lowercase
"usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d Aguilar
git-
c
vsimpo
r
t:
use a lowerc
a
se "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
l
ar
git-cvsimpo
r
t:
u
se 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
git-cvse
x
p
o
rtcommit: use a lo
w
e
r
case
"usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id Aguil
a
r
git-archimport: us
e
a
lower
c
ase "usage:"
s
tr
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git-merge-
o
n
e-file:
u
se
a
lowercase "usage:" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
git-relink: use a
l
owercase "us
a
ge:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
git-svn: use a lowercase
"
usage:" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-sh-setu
p
:
use
a
l
o
wercase
"
u
sage
:
" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
av
i
d Aguilar
p4merge: fix
p
rintf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Agui
l
ar
d
ifftoo
l
--helper: fi
x
p
r
int
f
usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
d
o
c: generat
e
a
l
i
st of val
i
d merge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
m
er
g
etool-
-
l
ib:
add fun
c
tions for finding ava
i
lable
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
avid Aguilar
me
r
getool--lib: imp
r
ove
the he
l
p
text in gue
s
s
_merge_
t
o
ol()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
m
ergetool--
l
ib: sim
p
lify
c
omm
a
nd expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David
Ag
u
i
lar
merg
e
tools: simplify ho
w
we handle
"vim" a
n
d "
d
ef
a
ult
s
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Dav
i
d Aguilar
mergetool--lib: improve show_tool_help() output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David
A
guil
a
r
mer
g
e
t
oo
l
s
/
vim: remove redundant diff com
m
a
n
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
mergetools/p
4
me
r
ge
:
Honor $TM
P
DIR for the /dev/nu
l
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
m
ergetools/p4merge: Handl
e
"/
d
ev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
mergetool--lib: All
o
w custom commands to over
r
ide
b
uilt-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: R
e
name 'ta
g
contents' to 'cac
h
ed
_
t
a
g
c
o
ntent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk:
Teach "Re
r
ead re
f
erences" to
reload tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
Dav
i
d Ag
u
i
l
ar
mergetool
,
difftoo
l
:
Document --tool-hel
p
consiste
n
tly
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Disabl
e
--symlinks
on cy
g
win
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguila
r
dif
f
tool
:
H
a
n
d
le co
m
pare
(
)
r
e
t
urning -
1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David
A
g
uil
a
r
difftool
:
Wrap long lines for
r
e
adabili
t
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id A
g
uilar
difftool
:
Check all return codes
f
rom compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
D
avid Aguil
a
r
diffto
o
l:
H
andle finding mergeto
o
l
s/ in a path
w
it
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diffto
o
l: Use symlinks wh
e
n diffing again
s
t the worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difft
o
ol: Call
the temp directory
"git-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
difftool
:
M
o
ve o
p
tion
v
alu
e
s into a
h
a
s
h
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguil
a
r
difftool: Elimin
a
t
e
global variab
l
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
ff
t
ool:
S
impli
f
y pri
n
t
_
tool_hel
p
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t780
0
:
Test difftool
passin
g
a
rguments to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
D
avid Aguilar
mergetool: Pr
o
vide an empty file
when need
e
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
M
a
kefile: Imp
r
ove com
p
iler
h
e
a
der depende
n
c
y che
c
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uilar
mergetools
/
mel
d
: Use '--ou
t
put' when available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uilar
mergetool--lib: Refactor tools int
o
separate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--lib: M
a
ke
s
tyle consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
d
ifft
o
o
l--helper: Make style co
n
sist
e
nt
w
ith gi
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
Dav
i
d Aguilar
t
/
t7503-pre-commit
-
hook
.
sh: Add GIT_
P
REFIX te
s
ts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
gi
t
-mergetool--l
i
b: Make vimdiff retain th
e
cu
r
rent
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id Aguila
r
g
i
t: Remove handl
i
ng for GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David
A
guilar
s
e
tup: Provide GIT_PRE
F
I
X
to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Ag
u
ilar
s
u
bmodule sync:
Up
d
a
t
e "submo
d
ul
e
.
<
n
ame
>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
D
avid Aguil
a
r
mergeto
o
l: Skip autoresolved p
a
th
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id Agui
l
ar
Documentation:
E
xplain gi
t
-mergetool's u
s
e
of tempo
r
ary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
Dav
i
d
A
guil
a
r
Makefile: Remove usa
g
e of deprecate
d
Python "has_k
e
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
Dav
i
d Aguilar
difftool:
F
ix '--gui' wh
e
n diff
.
gui
t
ool is unconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7
8
0
0
-
difftool
.
sh: T
e
st merg
e
tool
.
pr
o
mpt fa
l
l
back
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
avid Aguilar
d
ifft
o
ol: Update copyright
notices to list e
a
ch
y
ear
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d Aguilar
difftool: U
s
e
eval to expand '--extcmd'
e
xpre
s
sions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguilar
di
f
ftool: Add '-
x
' and as
a
n alias for '--extc
m
d'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguilar
t
7
800-difftool
.
sh: Simp
l
if
y
the -
-
extcmd
test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
g
i
t-diff
.
txt: Link
t
o git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Aguilar
diffto
o
l: Allow spe
c
ify
i
ng unconfig
u
red comm
a
n
d
s
w
ith
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Ag
u
ilar
d
i
fftool--helper: Remove use
o
f the GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftoo
l
-
-
h
e
lper: Update copyright and remove distracti
n
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-d
i
fftool: Add '--gui'
for selecting a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David A
g
ui
l
a
r
t78
0
0-difftool
:
S
e
t
a
b
o
gus tool f
o
r
u
s
e by t
e
st
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David
A
guilar
h
e
lp: D
o
no
t
unn
e
cessaril
y
look for a reposi
t
ory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David
Aguilar
submodule
.
c: Squelc
h
a "use before assi
g
nment" wa
r
ning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguilar
diff: generate
pretty f
i
lenames
i
n
prep
_
temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Aguilar
compat:
a
dd
a
basename
(
) compatib
i
lity funct
i
on
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add
a
m
k
s
temps() compat
i
bi
l
ity functi
o
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Agu
i
lar
Add git-re
p
lace to
.
gitignor
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Agui
l
ar
mergetool--lib: a
d
d support for araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David A
g
uilar
mergetool--
l
ib: specialize dif
f
op
t
ions for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguil
a
r
mer
g
etool--lib:
simpli
f
y A
P
I u
s
a
g
e by
r
emo
v
i
n
g
more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
diff
t
o
o
l/
m
e
r
getool: refactor command
s
to use git-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Ag
u
ilar
mergetool: use
$
(
.
.
.
) instead of `backt
i
c
k
s`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guil
a
r
bash comp
l
etion: ad
d
git-d
i
fftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
difftoo
l
: add su
p
port
for a difftool
.
prompt
config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguila
r
d
if
f
tool: add vari
o
us git-difftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
diffto
o
l
:
m
ov
e
'git-dif
f
too
l
' ou
t
of c
o
ntrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id
A
guilar
difftool: add
a
-y shortcut
f
o
r
--no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diffto
o
l:
use perl bu
i
lt-ins when te
s
ting
for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
d
ifftool: remo
v
e t
h
e b
a
ckup
f
ile feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
di
f
ftoo
l
: remo
v
e merge op
t
ion
s
for opendi
f
f,
tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Agui
l
a
r
everyday: use the da
s
hless fo
r
m of
g
i
t-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contrib
/
difftool: u
s
e
a separate config namespace fo
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
contrib/difftool
:
D
on't repeat merge tool candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
av
i
d Aguilar
difftool:
p
ut the cur
s
or on the e
d
it
a
bl
e
f
ile
f
or Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David
A
gu
i
lar
diffto
o
l: fix documentation pro
b
l
e
ms
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
Dav
i
d A
g
uil
a
r
contrib:
a
dd
'
git difft
o
ol' for lau
n
c
h
ing common
m
erge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
Davi
d
Ag
u
ilar
git-me
r
g
e
tool: properly handle "git mergetool -- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
te
s
t
s
: add a
testcase for "git submodule sy
n
c"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
D
a
vid Agu
i
lar
git-submod
u
l
e: add "syn
c
" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git
-
submo
d
ule: repla
c
e
duplicated code with a mo
d
ule_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
D
avid Aguilar
[PATCH] gitk:
D
o
n'
t
s
h
ow
l
ocal
ch
a
ng
e
s when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree