repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
contrib/mw-to-git/t/install-wiki.sh: use a lowercase "usage:" string
2013-02-25
David Aguilar
contrib/mw
-
t
o-git/t/insta
l
l-wiki
.
s
h:
use a l
o
werca
s
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Agui
l
ar
co
n
trib/examp
l
es/git-remote
.
perl: u
s
e
a lowercase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
test
s
: use a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
git-svn
:
use a
low
e
rc
a
se "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid A
g
u
il
a
r
Documenta
t
ion/user-manual
.
txt
:
u
se a
lo
w
e
r
c
a
s
e "
u
sa
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
te
m
plates/hooks--update
.
sample: use a lo
w
e
r
case "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/hooks/setgitperms
.
perl:
use
a
l
o
w
erca
s
e "
u
s
a
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Agu
i
l
a
r
contrib/examples: use a low
e
rc
a
s
e "usa
g
e:
"
strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
contrib
/
f
ast
-
import/i
m
port-zips
.
py:
u
s
e spaces instead
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-i
m
por
t
/
i
mp
o
r
t
-zip
s
.
p
y: f
i
x broken error
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
o
ntrib/
f
ast-import: use
a
lowercase
"
usa
g
e:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
con
t
rib/credenti
a
l
:
us
e
a lowerca
s
e
"
usage:
"
str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
l
ar
g
it-cvsimport: use a
lowerca
s
e "usage:" st
r
i
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguila
r
git-cvsimp
o
rt:
u
se a lowercase "u
s
ag
e
:" strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid A
g
uilar
git-
c
vsexpo
r
tcommit:
u
se
a
l
owercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
git-archimport:
u
s
e
a lo
w
ercase
"usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git
-
m
e
rge-one-file: use a lowercase
"usage:"
s
t
r
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d Aguila
r
git-relink: use a lowe
r
case "usag
e
:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
g
it-svn:
u
se
a
lower
c
as
e
"usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
git-sh-setup: us
e
a
lowercase "usage:
"
str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
Davi
d
Ag
u
ilar
p4merge: fix p
r
int
f
u
s
age
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David A
g
uila
r
difftool--hel
p
er: fix pri
n
tf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
Davi
d
A
guilar
doc: gene
r
ate a list
o
f
va
l
id me
r
ge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
Davi
d
Aguilar
merget
o
o
l
--li
b
:
a
d
d fu
n
cti
o
ns for finding available
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool
-
-
l
i
b:
improve the
h
e
lp text in guess_merge_tool(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool--lib: simplify comm
a
n
d
e
xpressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
merge
t
ools: simplify how w
e
ha
n
dle "v
i
m"
a
nd "def
a
ults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Ag
u
ilar
mergetool--
l
ib: i
m
prov
e
show_tool_he
l
p() output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David
Ag
u
ilar
mergetools/vi
m
: rem
o
ve
red
u
ndant diff command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
Dav
i
d Aguilar
merg
e
t
o
ols/p4m
e
r
g
e
: Ho
n
or $TMPDIR
f
o
r
the /
d
ev/
n
u
l
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
me
r
getools/p
4
mer
g
e: Han
d
le "/dev/n
u
l
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguil
a
r
me
r
geto
o
l--l
i
b: A
l
low
c
ustom comman
d
s to override built-
i
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguil
a
r
git
k
: Rename 'ta
g
contents' to 'c
a
c
he
d
_
tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David A
g
u
ilar
gitk: Teac
h
"Reread r
e
ferenc
e
s" to
r
eload tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
merg
e
tool,difft
o
ol: Document --tool
-
help consistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
u
ilar
difftool
:
Di
s
abl
e
--symlinks
on
c
y
g
win
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
avid Aguilar
difftool: Han
d
le
c
ompare
(
) r
e
turning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Agui
l
ar
diffto
o
l:
W
r
a
p long lines for readab
i
lity
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David
Ag
u
ilar
dif
f
tool: Chec
k
all return codes from compare(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id Aguilar
d
ifftoo
l
: Handle f
i
nding mergetools/ in a
path wi
t
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Use sy
m
links wh
e
n diffing
a
g
a
inst the work
t
ree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
fftoo
l
: Call
t
he temp
d
irectory
"git-difftool
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Agu
i
lar
d
ifftool:
M
ove option val
u
es into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
ifftool: Eliminate global
variables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
d
i
fft
o
ol:
S
imp
l
ify print_tool_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
Dav
i
d Aguilar
t
7
8
00
:
T
est di
f
ftool pas
s
ing argume
n
ts
to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguila
r
m
e
rget
o
ol: Provide an empty
f
ile when need
e
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguila
r
Makefile: Improv
e
compiler
header dependency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
A
guilar
merg
e
tools/meld: Use '--ou
t
p
u
t'
w
hen available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Agui
l
ar
mergetool--lib:
R
efactor too
l
s
into separ
a
te files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--lib: Ma
k
e
style consistent with
git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
i
d
A
g
uila
r
difftool--helper
:
Make style consis
t
ent with
g
it
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/
t
7503-pre-
c
ommit-hook
.
sh: Add GIT_PREFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
il
a
r
git-mer
g
eto
o
l--lib:
M
ak
e
v
imd
i
ff retain t
h
e current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
uila
r
git: Remove handlin
g
for GIT_PRE
F
IX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setup: Provide
GIT_PREFIX to built-
i
ns
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David A
g
uilar
s
u
bmodule syn
c
:
Update "s
u
bmodule
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
mergetool: Skip au
t
oreso
l
ved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David
A
guilar
Documentation:
E
x
p
la
i
n git-
m
ergetool's use of temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David A
g
uilar
M
a
ke
f
i
l
e:
Remove usage
of deprecated Python "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David
Ag
u
ilar
d
i
fftool: Fix '--gui'
w
hen
d
i
ff
.
guitool is unco
n
figu
r
ed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800-d
i
fftool
.
sh: Test merg
e
tool
.
prompt f
a
llback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
a
vid
Aguilar
diff
t
ool: Update
c
o
pyrig
h
t notices to list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguila
r
difft
o
ol: Use eval to ex
p
and '
-
-e
x
tcmd' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agu
i
lar
difftoo
l
: Add '-x'
and as a
n
ali
a
s
f
o
r
'
--extcm
d
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d
A
g
u
i
lar
t7800-diffto
o
l
.
sh: Simplify the --
e
xtcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguilar
g
i
t
-diff
.
txt: Link to gi
t
-
d
iff
t
ool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
i
d
Aguila
r
difftool:
Al
l
ow specifying uncon
f
igured comm
a
nds with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
dif
f
tool--he
l
per: Remove use of the GI
T
_MER
G
E_TOO
L
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
dif
f
tool-
-
helper: Up
d
ate co
p
yright
and remove di
s
tracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Agu
i
l
ar
git
-
difftool:
A
dd '--gui' fo
r
selecting a
GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t
7
8
0
0
-difftool: Set a bogus tool for
u
se by te
s
ts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Dav
i
d Agu
i
lar
hel
p
:
Do not un
n
ecessarily look for a repositor
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David
Aguilar
submodule
.
c
: Squelc
h
a "use before assignment
"
warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agui
l
ar
diff:
g
enerate p
r
e
tty filenames in prep_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Aguilar
compa
t
:
a
dd
a
bas
e
name() compatib
i
lity
f
unction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
compat:
a
dd a mkste
m
p
s
() com
p
atibilit
y
f
u
nction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
lar
Add git-rep
l
ace to
.
gitig
n
ore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
Da
v
id
A
guilar
merge
t
oo
l
--lib: add su
p
port for
ar
a
x
i
s
m
erge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
Davi
d
Aguilar
mergetool--lib: spe
c
ializ
e
d
i
ff opt
i
ons
for e
m
erge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
a
vid Aguil
a
r
mergetool--lib: s
i
mplify
A
PI usage by removing m
o
re
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
diff
t
ool/mergetoo
l
: refactor commands to
use git-m
e
r
g
etool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
mergetool: us
e
$(
.
.
.
) instead of
`backti
c
ks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bas
h
completi
o
n: add
git-dif
f
tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
l
ar
difftool: add support f
o
r
a
difft
o
o
l
.
p
rompt con
f
ig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Agu
i
lar
diffto
o
l: add various
g
it-di
f
ftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
diff
t
o
o
l: mov
e
'git
-
d
i
fftool
'
out of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
difftoo
l
: add
a -y shortcut for
-
-no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid
Agu
i
l
ar
diffto
o
l
:
use perl built-in
s
when test
i
ng for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difft
o
ol: remo
v
e the b
a
c
k
up file feat
u
r
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id
A
gu
i
la
r
difftool: r
e
move merge optio
n
s
for
opendiff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
D
a
vi
d
Aguilar
ev
e
r
yday: use the
d
ashless
f
orm of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
Da
v
id
A
g
uilar
contrib/
d
i
f
ftool: use a separate
c
onfig
n
ame
s
p
ace
for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David
Aguilar
contri
b
/
diff
t
ool: Don't
r
ep
e
at merge tool candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool: p
u
t
the cursor
on the editable file for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
v
id Aguilar
difftool:
f
ix documentat
i
on problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Agu
i
lar
contrib:
a
dd 'git
difftool' for launching common merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git
-
m
e
rg
e
tool: properly handle
"
git mergetool -- filen
a
m
e
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Agui
l
ar
test
s
: add a tes
t
case fo
r
"git submodule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
Da
v
id A
g
uil
a
r
git-submod
u
le:
a
dd "sync
"
comman
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next