repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation/user-manual.txt: use a lowercase "usage:" string
2013-02-24
D
a
vid Aguilar
Do
c
umentation/user
-
manual
.
t
xt:
u
se a
l
o
wercase "u
s
age
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
temp
l
ates/hoo
k
s--update
.
sample: use a lowercas
e
"usa
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
contrib/hooks/setgitperms
.
per
l
: use a lower
c
as
e
"u
s
a
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contr
i
b/examples
:
u
se a lowercase "usage:
"
s
trin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Agu
i
lar
co
n
t
r
i
b/fas
t
-import/
i
mport-zips
.
py:
use spaces instead
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-impor
t
/
import-zips
.
py
:
fix broken error
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
contrib/f
a
st-import: use
a
lowercase "usage:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguila
r
contrib/cre
d
ential: use a l
o
we
r
cas
e
"us
a
ge:" s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t-cv
s
import:
use
a
lo
w
ercas
e
"us
a
ge:" st
r
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
gi
t
-cvsimport:
u
se
a low
e
rcase "usage:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
git-cvsexportcommit: use a lowerc
a
se "usage:"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
g
i
t-archimport: us
e
a
l
o
w
erc
a
se "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-merge-one-file
:
u
s
e
a
l
o
w
erc
a
se "u
s
age:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
g
i
t-relink: use a lowercase "u
s
age:"
s
trin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Agu
i
l
ar
git-svn: use a
l
owerc
a
se
"usage
:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
git-sh-setup: use a low
e
rcase "usage:" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p
4merge: fix pr
i
ntf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David A
g
ui
l
ar
dif
f
tool-
-
helper
:
fix pri
n
tf u
s
a
ge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
a
v
i
d Agui
l
ar
doc
:
g
enerate a lis
t
of
v
a
lid merge t
o
ols
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
mergeto
o
l--lib: add functions f
o
r fin
d
ing
avai
l
ab
l
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
avid
Ag
u
ilar
mergetool--lib: improve the
h
e
lp text in guess_merge_
t
o
o
l
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
me
r
g
e
tool--li
b
:
s
implify comm
a
nd expr
e
ssions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetools: s
i
mplify how we h
a
ndle "vi
m
"
and "def
a
u
l
t
s"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
me
r
getool--lib: improve sh
o
w_
t
ool_h
e
lp()
o
utput
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Ag
u
i
l
ar
mergetool
s
/vim: remove re
d
undant diff command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
D
a
vid
A
g
u
ilar
m
e
rget
o
ols/p4mer
g
e: H
o
nor $TMPDI
R
for the /dev
/
null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
Dav
i
d Aguilar
mergetools/p4merge: H
a
ndle "/dev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Agu
i
lar
mergetool
-
-lib: Allow cu
s
to
m
commands
t
o override bu
i
l
t-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguil
a
r
g
i
tk:
Ren
a
m
e 'tagcontents' to
'
cac
h
ed_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d Aguilar
gitk
:
Teach "Reread references" to reload tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Aguil
a
r
merget
o
ol,difftool: Document --tool-help consistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
avid Aguilar
difftool:
Disa
b
le --syml
i
nks
o
n c
y
gwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Aguilar
diffto
o
l
: Handle
com
p
are() returning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Aguilar
difft
o
o
l: Wrap long lines for readabi
l
ity
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
d
ifftool:
Check all
r
et
u
rn
codes f
r
om compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
d
i
fft
o
o
l
:
H
andle finding mergetools
/
in a path w
i
th
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Use
syml
i
nks when di
f
fing
a
g
a
in
s
t
the wor
k
t
r
ee
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
ilar
di
f
fto
o
l: Call
t
h
e temp dire
c
tory "git-difftool
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uil
a
r
difftool: Mo
v
e option
v
alues i
n
to
a
hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
avid
A
guil
a
r
d
iff
t
o
o
l
:
Elim
i
nate global vari
a
bles
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
if
f
tool: Simpl
i
fy p
r
int_tool_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
Dav
i
d Aguilar
t780
0
: Test difftool pa
s
sing arguments t
o
di
f
f
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguil
a
r
mer
g
etool: Provide an
e
mpty f
i
le w
h
e
n
n
eeded
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makef
i
l
e: I
m
prove compiler header depende
n
cy check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id
A
g
u
ilar
m
ergetools/meld: Use '--output' wh
e
n available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Ag
u
ilar
merg
e
tool--lib:
Refactor tools into separate fil
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
A
g
uilar
mergetool--
l
ib: Make s
t
yle c
o
n
sistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id
A
g
u
i
l
a
r
d
i
fftool-
-
he
l
per: Make style consisten
t
with g
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t
/
t
7
503-pre-
c
ommit-ho
o
k
.
sh: Add GIT
_
P
R
E
FIX t
e
sts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David
Aguilar
git-
m
erg
e
tool--lib: Make vimdiff ret
a
in the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid A
g
uilar
git: Rem
o
ve handlin
g
f
o
r GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setup: Provide GIT_PREFIX to b
u
ilt
-
ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
sub
m
odu
l
e
sy
n
c
:
Update "submodule
.
<name>
.
u
r
l"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
D
a
v
i
d Aguilar
m
e
r
g
etoo
l
:
Skip
a
utoresolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
D
avid Agui
l
ar
Docume
n
t
a
t
i
o
n: Explain gi
t
-mer
g
e
t
ool
'
s us
e
of tempor
a
ry
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
Dav
i
d
A
gui
l
ar
Ma
k
efile: Remove usage o
f
deprecated
P
yth
o
n
"has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Ag
u
ilar
di
f
ftool:
F
ix '--gui' when diff
.
g
u
i
tool
is un
c
onfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800-difftool
.
sh: Test merg
e
tool
.
p
r
ompt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
a
v
id Aguila
r
d
i
fftool
:
Up
d
ate copyright
notices to list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguilar
diffto
o
l: Use eval to e
x
pa
n
d '-
-
ext
c
md'
e
xpr
e
ssion
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool: Add
'
-
x
' and as an alias for '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
Aguilar
t7
8
00-difftool
.
sh: Simplify the --extcmd te
s
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid
A
guilar
git
-
dif
f
.
txt:
Lin
k
to g
i
t
-di
f
ftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
uilar
d
iffto
o
l: Allow specifying unconfigured comman
d
s
wit
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguilar
d
ifftool--
h
elpe
r
: R
e
move
use
of the GI
T
_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
ar
difftool--help
e
r
: Update copyright and
r
e
move d
i
s
t
r
acting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguil
a
r
git-d
i
ffto
o
l: A
d
d '
-
-
g
ui' for select
i
ng a
GUI t
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid Ag
u
ilar
t
7800-difftool: Se
t
a bogus tool for use by
t
ests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguil
a
r
hel
p
: Do not unnecessa
r
ily
look for a r
e
pository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Agui
l
a
r
subm
o
d
u
l
e
.
c:
S
q
uelch a "use before assig
n
ment"
warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
v
id Aguilar
d
if
f
: genera
t
e prett
y
fil
e
names
i
n
prep_te
m
p_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguil
a
r
compat:
add a basename
(
) c
o
mpatibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
compat: add a
m
k
stemp
s
() compatibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
uilar
A
dd git-
r
eplace to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Agui
l
ar
mergetool--lib:
a
dd suppo
r
t
f
or araxis merg
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David
A
g
uilar
mergetool--l
i
b: spec
i
alize d
i
ff op
t
ions fo
r
emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
Da
v
id
A
guilar
mergeto
o
l-
-
l
i
b: simplify
API u
s
age by removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
diff
t
o
o
l/mer
g
etool: refa
c
tor comman
d
s
to
use
g
it-
m
ergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Agu
i
la
r
mergetool: use $(
.
.
.
) in
s
tea
d
o
f `
b
ackti
c
ks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
ba
s
h completion:
a
dd
g
it-diff
t
ool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difft
o
ol: add supp
o
rt fo
r
a diffto
o
l
.
p
r
ompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avi
d
Aguila
r
difft
o
o
l: add v
a
r
io
u
s git
-
diff
t
ool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftool: m
o
ve 'git-difftool' ou
t
of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
tool: add a -y
short
c
ut for -
-
n
o
-
prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
l
a
r
dif
f
tool: us
e
p
e
rl built-ins w
h
en te
s
tin
g
for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ftool: remove the back
u
p f
i
le feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
t
o
ol: rem
o
ve me
r
ge option
s
for opendif
f
,
tkd
i
f
f
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Agui
l
ar
everyday:
use the dashless
f
o
rm of git
-
i
n
it
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
D
avid Aguil
a
r
contrib/dif
f
tool: use
a separate
c
onfig names
p
ace
f
or
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
D
avi
d
Ag
u
ilar
c
o
ntrib/diff
t
ool:
Don't repea
t
merge tool candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David
Aguilar
di
f
ftool: put the
c
u
r
s
o
r on
t
he editable file f
o
r V
i
m
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Agu
i
l
ar
difftool: fix doc
u
mentatio
n
problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
Davi
d
Aguilar
c
o
ntrib:
a
d
d 'git di
f
ftool'
f
or launchin
g
common merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
D
avi
d
A
guilar
git
-
mergetool
:
properly handle
"
git mergetool -
-
filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Agu
i
lar
tests: add
a testcase for
"
g
i
t submodule
s
ync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git-su
b
module: add "sync" c
o
mmand
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Ag
u
ilar
gi
t
-sub
m
odule: replace duplicated
c
ode with a
m
odu
l
e
_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Ag
u
ilar
[
PATCH] gitk: Don't sh
o
w local chang
e
s
when w
e
there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree