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
templates/hooks--update.sample: use a lowercase "usage:" string
2013-02-24
Da
v
id Aguilar
t
e
mplates/hooks--up
d
a
t
e
.
sample: us
e
a
lowerc
a
se "us
a
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
contrib/hooks/s
e
tgitpe
r
ms
.
perl: use a lowerc
a
s
e "
u
s
age
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
contri
b
/examples:
u
se a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
co
n
trib
/
fast
-
i
mpo
r
t/import
-
zips
.
p
y
: use
s
paces instead
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
c
ontr
i
b/fast-impo
r
t/import-
z
ips
.
py:
f
ix br
o
ken
error
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
co
n
tr
i
b/fas
t
-import: use a lowe
r
case
"usage
:
" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
co
n
t
r
i
b/cre
d
ential
:
use a lowercase "us
a
ge:"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Ag
u
ilar
git-cvsimpo
r
t: use a lowe
r
case "usage:"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
git-cvsimport:
use a lowercase "usage:"
s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
gi
t
-cvsexportcom
m
i
t: us
e
a lowercase "usag
e
:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
git-a
r
c
h
import: use a lowercase "
u
sage:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
g
it-merge-o
n
e-file: use
a
lowercas
e
"
u
sage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git
-
relink:
use a lowe
r
case "u
s
age:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-
s
v
n: use a lower
c
a
s
e
"usage:" strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-sh-
s
etup
:
use a l
o
wercas
e
"usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguil
a
r
p4mer
g
e
: fix printf u
s
age
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vi
d
A
g
u
ilar
difftool--helper: f
i
x print
f
usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
Dav
i
d A
g
ui
l
ar
doc: generate
a list of vali
d
me
r
ge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid Aguilar
mergetool--
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
David Aguilar
mergetool
-
-lib: improv
e
t
h
e he
l
p te
x
t in
g
ue
s
s_m
e
rge_t
o
ol(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
merge
t
ool--lib: simp
l
ify co
m
mand express
i
ons
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
Aguilar
m
e
rgetools: simplify how we handle "vim" and "de
f
ault
s
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mergetoo
l
--lib: impro
v
e
sh
o
w_too
l
_help() output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David
A
guilar
mergeto
o
ls/vim: remove redund
a
nt diff command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
D
avid Ag
u
i
lar
merget
o
o
l
s
/p4merge: Honor $TMPDI
R
f
o
r the /dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Ag
u
ilar
mer
g
et
o
ols
/
p4merg
e
: Handle "/dev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
Da
v
i
d
Aguilar
mergetool--lib: Allow custom commands to override bui
l
t-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
g
itk: Renam
e
'tagcontents' to 'cached_t
a
gcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David
Aguilar
gitk
:
T
e
a
ch "Reread refer
e
nces"
to re
l
oad
t
ags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
Dav
i
d A
g
uil
a
r
merget
o
o
l,di
f
ftool: Do
c
um
e
nt --tool-help consistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Disable --
s
ymlinks o
n
cygw
i
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Aguilar
d
i
fftool: Han
d
le com
p
are() returning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Wrap lo
n
g lines
f
or
r
eadability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Agu
i
lar
difftool: Chec
k
all return co
d
es fro
m
compare
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguil
a
r
diffto
o
l: Handle f
i
nd
i
ng mergetools/ in a path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Agui
l
ar
difftool: Use symlinks when
d
iffing
a
gai
n
st th
e
w
o
rktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Call the
t
emp
directory
"
g
i
t
-diffto
o
l"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
d
i
fftool:
M
ove option values into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
A
guilar
difftool:
E
l
iminate g
l
oba
l
variables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id A
g
uilar
diff
t
ool
:
Simplify p
r
int_
t
ool_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
Davi
d
Aguila
r
t7800
:
Test
d
iff
t
ool passi
n
g arguments
t
o diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
D
a
vid Aguilar
mergetool: Provide an empty
f
ile when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
M
a
kef
i
le
:
Improve
c
ompile
r
he
a
de
r
dependency
c
heck
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetools/meld: Use '--output' when
a
v
a
ilable
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
A
guilar
merge
t
oo
l
--lib:
R
efactor tools into separate file
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
A
guilar
mer
g
etool--lib:
Make style consistent
w
ith
gi
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agui
l
a
r
difftool--helper: Mak
e
style consistent with g
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
Da
v
id
A
gu
i
l
a
r
t/t7503-pre-commit-hook
.
sh:
Add GIT_PREFI
X
tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Aguilar
git-me
r
getool--lib:
M
ake vimdiff retain the
c
urrent
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: Remove
h
a
ndl
i
ng
f
or
GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
ilar
s
e
tup: Pr
o
vid
e
GI
T
_PRE
F
IX to built-
i
ns
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Dav
i
d
A
gu
i
lar
submodu
l
e
sync: U
p
d
ate "
s
ubmodule
.
<na
m
e>
.
url
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David
Aguilar
merge
t
ool: Skip aut
o
r
esol
v
ed pat
h
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Dav
i
d Aguilar
Document
a
tion: Explain
g
i
t-mergetool's use of temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefile
:
Remo
v
e
u
sage of depreca
t
ed Python
"
h
as_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
D
a
vid Agu
i
la
r
dif
f
t
o
o
l
: F
i
x '--g
u
i
'
when diff
.
guitool is unco
n
fi
g
ured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David
A
guilar
t7
8
00
-
difftool
.
sh: T
e
st m
e
rgetool
.
prompt
fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David A
g
uilar
d
i
f
ftool: Update copyright
notices to li
s
t
each
year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
ifftool: U
s
e eval to expand '--ex
t
cmd' expr
e
s
si
o
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d Agui
l
ar
di
f
f
t
ool
:
Add '-x' and as an alias for '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
ilar
t7800-difftoo
l
.
sh: Simplify the --extcmd te
s
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
git-diff
.
tx
t
: Link t
o
git-difft
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
u
i
lar
di
f
fto
o
l: Allow
s
pecifying unconf
i
g
u
red commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftoo
l
--helper: Remove use
o
f the GIT_MERGE_
T
O
O
L
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
ar
diff
t
ool--help
e
r: Update copyrigh
t
and remove
distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Ag
u
ilar
git-dif
f
tool: Add '--
g
ui' for sel
e
c
ting a GUI t
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David A
g
uilar
t7800-difftool: Set a bog
u
s tool
f
or use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David A
g
u
ilar
h
e
l
p
:
Do not
unne
c
essar
i
ly
l
ook
for a repositor
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
Davi
d
Aguilar
sub
m
o
d
u
l
e
.
c:
S
quelch a "use before assignme
n
t" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d
Agu
i
l
ar
diff: generate pretty
f
ilen
a
mes in prep_temp_b
l
ob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
il
a
r
c
ompa
t
: a
d
d a ba
s
ename(
)
compati
b
ility
f
unction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
c
o
mpat:
add
a
m
k
stemp
s
() co
m
patibilit
y
function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d
A
guilar
Add git-replace to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
D
a
v
id Aguilar
mer
g
etool-
-
lib:
add sup
p
ort f
o
r araxis mer
g
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
D
avid Aguilar
mergetool--lib: specialize
d
i
f
f opti
o
ns for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
Da
v
id Aguil
a
r
m
erget
o
ol-
-
l
ib: simplify API usage by removing
more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
diffto
o
l/me
r
getool: refactor commands to use
g
it-m
e
rgeto
o
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguil
a
r
m
e
rgetool:
use $(
.
.
.
) instead of `backti
c
ks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
bash
c
ompletio
n
: add
g
i
t-diff
t
ool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
difftool
:
add sup
p
ort f
o
r a difftoo
l
.
pro
m
pt
co
n
fig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
dif
f
tool: add
v
ariou
s
git
-
diffto
o
l te
s
ts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: move
'git
-
difft
o
ol'
o
ut of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ftool: add a -
y
sh
o
rtcut for --no
-
p
r
ompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
a
r
diffto
o
l: use p
e
rl built-ins when testing f
o
r msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftoo
l
:
remove
the back
u
p file f
e
atur
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
d
i
fft
o
ol: remove mer
g
e option
s
for op
e
ndiff, tkd
i
ff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
Dav
i
d
Aguilar
ever
y
da
y
: us
e
th
e
dashless form
of
g
it-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Agu
i
lar
contr
i
b/di
f
fto
o
l: use a separate c
o
nf
i
g n
a
mes
p
ace f
o
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David
A
gu
i
lar
contrib/difftool: Don't repeat
m
erge tool candidate
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
v
id Aguilar
d
ifftool: p
u
t the cur
s
or on the
e
ditable
file for
Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Ag
u
i
l
a
r
d
i
fftool:
fix documen
t
ation pr
o
blems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
contrib: ad
d
'git
d
ifftoo
l
' for
l
a
u
nching co
m
mon merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
Dav
i
d A
g
uilar
git-merge
t
ool: properly handle "
g
i
t
merget
o
ol -- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
Dav
i
d Aguilar
tests: add a
t
es
t
cas
e
f
o
r
"gi
t
submodule s
y
nc"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
Da
v
id
A
guilar
git-submodule: add "sy
n
c" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David
Aguilar
git-s
u
bmodule: r
e
place duplicated code with
a m
o
d
u
le_lis
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David
Aguilar
[PA
T
C
H
] gi
t
k:
D
on't
show
l
ocal
changes when we ther
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree