repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-cvsimport: use a lowercase "usage:" string
2013-02-24
David Ag
u
ilar
git
-
cvsimp
o
rt: u
s
e a
lowe
r
case "usage:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d Aguilar
git-cvsimport
:
use a lowercase
"u
s
age:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
git-cvsexportcommit: use a lowercase
"
u
s
age:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
u
i
lar
git-archimpor
t
:
u
se
a
l
owercase "usage:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
git-merg
e
-
o
ne
-
file: u
s
e a
l
o
werca
s
e "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
gi
t
-reli
n
k: use a lo
w
erc
a
s
e
"usage:" strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
git-svn: use
a
lowerc
a
se "usage:"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguil
a
r
g
i
t-s
h
-setup: use a lo
w
ercase "us
a
g
e
:
"
s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Ag
u
ilar
p4merge:
f
ix prin
t
f usag
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
d
ifftool--helper: fix printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid Aguilar
doc:
generate a
list
o
f va
l
i
d
merge to
o
ls
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
mergetool--lib:
a
dd
f
unct
i
ons for finding available
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
me
r
g
e
t
o
ol
-
-lib: impr
o
ve
the help
text
i
n
g
uess_merge
_
tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David
Aguil
a
r
merget
o
ol--l
i
b: simplify com
m
and e
x
pressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid
A
gu
i
lar
m
e
rgetools: simpli
f
y how we handle
"v
i
m" a
n
d "defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Dav
i
d
Aguilar
m
erg
e
tool--l
i
b: improve sh
o
w_tool_help()
output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Da
v
id Aguilar
m
e
rgetools/vim: remove red
u
nd
a
nt diff command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
D
avid Agu
i
lar
mergetools
/
p4merge: Honor
$
TMPDIR for
th
e
/de
v
/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
D
avid Aguilar
mergetools/
p
4
m
erge: Handle "/d
e
v/null
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
m
erget
o
ol--lib:
A
l
low cust
o
m
command
s
to override built-in
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Davi
d
Agu
i
lar
gitk:
R
ename 'tagcont
e
nts
'
to 'c
a
ched_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
a
v
i
d Aguilar
gitk: Teach "Reread refer
e
nces" to reload tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Ag
u
ilar
merget
o
o
l,dif
f
tool: Docum
e
nt --tool-help co
n
sistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Agu
i
lar
d
iffto
o
l: Disable
--symlinks on cy
g
win
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: H
a
ndle co
m
pare() returning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David
Agui
l
ar
d
ifftool: W
r
ap long lines f
o
r
read
a
bi
l
ity
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difft
o
o
l
:
C
h
eck all
r
eturn
codes from
c
ompa
r
e()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool:
H
andle findi
n
g
mergetool
s
/ in a
path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
A
g
u
ilar
di
f
f
t
ool: Use symli
n
k
s when diffing a
g
a
inst the work
t
ree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
u
i
lar
difftool: Call the
t
em
p
directory
"git-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d
Aguila
r
di
f
ftool: Move o
p
tio
n
value
s
in
t
o a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguilar
difftool:
E
liminate
glo
b
al vari
a
bles
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id
A
g
uilar
difftool: Simp
l
ify p
r
i
nt_tool_help(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David
Aguilar
t
78
0
0: Test difftool passing a
r
guments to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Ag
u
ilar
m
e
rge
t
ool: Provide an
empty fi
l
e when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
D
a
vid
Aguilar
Makefile
:
I
m
p
r
ove compiler h
e
ader dep
e
ndency
c
heck
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Aguilar
mergetools/meld: Use
'
-
-o
u
tput'
w
hen
a
vailable
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
mergetool--lib
:
Refact
o
r
tools into sepa
r
ate file
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Aguilar
m
ergetool--lib:
M
a
ke
s
t
y
le consistent wit
h
git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
difftool-
-
h
e
lper:
Make style consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Agui
l
ar
t/t7503-pre-commit-hook
.
sh: Add
GIT_PREFIX
t
ests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-mergetool--l
i
b: Make
v
i
m
d
iff retain the
cur
r
ent
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David
Aguila
r
git:
Remove
h
andling for G
I
T_PREFI
X
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id Aguilar
se
t
up: P
r
ovide GIT_P
R
EFIX to
b
uilt-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodule syn
c
: Update "submodule
.
<name>
.
url
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
Dav
i
d
Aguilar
m
e
rgeto
o
l
: Skip autoresolved
path
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
D
a
vi
d
Aguilar
Documentation: Explain git
-
mergetool's use
o
f t
e
m
p
orary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
Dav
i
d Aguilar
Makefile:
Re
m
ove usage of deprecat
e
d Python "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
Da
v
i
d
Ag
u
ilar
difftool
:
Fi
x
'--gui' when
dif
f
.
g
u
itoo
l
is unconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
Da
v
id Aguilar
t7800-difftool
.
s
h
:
T
e
s
t merg
e
tool
.
prom
p
t
fal
l
back
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difftool
:
Update copyrig
h
t
n
o
tices
t
o
list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
A
g
uilar
d
ifftoo
l
: Use eval
to expand '--extcmd' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d Agu
i
lar
difftool: A
d
d '-x' and as an alias for '--extcmd
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7800-d
i
f
f
tool
.
sh: Simp
l
ify the -
-
extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
git-diff
.
txt: Link to git-
d
i
f
ftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
i
fftool
:
A
llow specifying uncon
f
igured comm
a
nds
w
ith
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
difftool--helper: Re
m
o
v
e
u
s
e of
t
he GIT_MER
G
E_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguil
a
r
d
i
fftool--helper
:
Up
d
a
t
e copy
r
ight and re
m
ove distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-
d
ifftoo
l
: Add '--gui'
f
or selecting a G
U
I t
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David
A
guila
r
t
78
0
0-difftool: Set a bogus tool for us
e
by tes
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David A
g
uilar
help: Do not unnecessarily look for a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
Dav
i
d Ag
u
ilar
subm
o
dule
.
c: Squel
c
h
a
"use before
a
s
si
g
nment" warn
i
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
g
uil
a
r
dif
f
: generate p
r
etty f
i
lenames in prep_tem
p
_
b
l
ob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
compat
:
add a b
a
sen
a
me() c
o
m
pati
b
ilit
y
f
u
nct
i
on
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
lar
compat: add a mkstem
p
s() comp
a
t
ibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguila
r
Add git-repla
c
e to
.
giti
g
nore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergetool-
-
lib: a
d
d supp
o
rt for
a
raxis me
r
ge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
Dav
i
d Aguilar
mergetool--lib: specialize diff o
p
tions for
e
merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
av
i
d
A
g
u
i
lar
merget
o
ol
-
-lib
:
s
i
m
plify AP
I
u
sage by removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
il
a
r
d
iffto
o
l
/
mergetool
:
refactor
com
m
ands to
use git-merg
e
to
o
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
mergetool: use $(
.
.
.
) i
n
stead of
`backt
i
ck
s
`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avi
d
Aguilar
bash compl
e
tio
n
: add g
i
t-diffto
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
d
i
fftool: add support fo
r
a d
i
f
f
tool
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid
Aguil
a
r
difft
o
o
l
: add
va
r
ious git-diffto
o
l te
s
ts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid
Agui
l
ar
diff
t
oo
l
: move 'g
i
t-diffto
o
l' out of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
d
ifftoo
l
:
add a -y s
h
ortcut for
-
-no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
g
uilar
di
f
ftool: use p
e
rl bu
i
lt-in
s
when testi
n
g for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
u
i
l
a
r
difftool: remove the backup file feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
uilar
difftool: remove merge
o
p
t
ions fo
r
opend
i
ff, tkd
i
ff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
D
a
vid A
g
uilar
everyd
a
y: use the
dashless
form
of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
D
a
vid Aguilar
contrib/di
f
ftool:
u
se
a
separate
c
on
f
ig
n
amespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
Davi
d
Aguil
a
r
contrib/difft
o
ol: Don't repeat merge tool candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
vid Aguilar
difftool: put t
h
e cur
s
or on the e
d
i
table file
for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Davi
d
Ag
u
ilar
d
ifftoo
l
: fix documen
t
at
i
on
p
roblems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
con
t
r
ib: add 'git difftool' for launching common
m
e
r
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-
m
e
rgetool: pr
o
p
e
rly handle
"
g
it merg
e
t
ool -- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests
:
ad
d
a testcase
fo
r
"git su
b
module sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
D
a
vid
A
g
u
ilar
git-submodule: add "sync
"
command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Agu
i
lar
git-s
u
bmod
u
le: replace du
p
licated co
d
e with a module_
l
ist
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
D
a
vi
d
Agui
l
ar
[PAT
C
H] gitk: Don't show local changes when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree