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-relink: use a lowercase "usage:" string
2013-02-24
Dav
i
d
A
g
uilar
gi
t
-
r
elink:
u
s
e a
l
o
wercase "
u
sage:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d Agui
l
a
r
git-svn: use
a
lower
c
as
e
"usag
e
:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
git-s
h
-setup
:
use a lower
c
ase "u
s
age:"
s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Ag
u
ilar
p4merge: fix printf usag
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid
Aguilar
difftool--helper:
f
ix
p
rintf
usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Agu
i
lar
doc: generate a
l
i
st
o
f valid m
e
rge too
l
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid Aguilar
m
ergeto
o
l
--lib:
add func
t
ions
fo
r
finding av
a
ilab
l
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
merget
o
o
l-
-
lib: improve the help te
x
t in guess_merge_tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Agui
l
ar
mergetool--lib: simplify command expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
i
d
A
guil
a
r
mergetools: simplify how we handle "vim" and
"
defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
D
avid Agui
l
ar
mergetool--lib: improve show_tool
_
help()
output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Dav
i
d Aguil
a
r
mergetool
s
/vim: re
m
ove redundant diff command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David
A
g
ui
l
ar
me
r
g
etools/p4merge: Honor $TMPDIR for th
e
/dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
merget
o
ols/p4
m
erg
e
:
Hand
l
e "/dev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
Davi
d
Aguilar
m
e
rgetool--lib
:
Allo
w
custom commands t
o
o
verri
d
e built
-
i
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d
A
g
u
i
la
r
gi
t
k: Ren
a
m
e 'tagconte
n
ts' to 'cach
e
d_tagcon
t
ent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguila
r
git
k
: Teach
"Reread refere
n
ces" to reloa
d
t
ags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
m
e
r
g
etool,difftool:
D
ocument --tool-hel
p
consistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: D
i
sable
--
s
ymlin
k
s on
c
ygwi
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id Aguilar
dif
f
tool: Handl
e
compa
r
e() ret
u
rning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
a
v
id
A
guil
a
r
dif
f
tool: Wrap l
o
ng
l
in
e
s for readability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id
Aguilar
dif
f
tool:
C
heck all return codes fro
m
compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
D
a
v
i
d
Aguilar
dif
f
t
o
ol: Ha
n
dle fi
n
ding me
r
ge
t
ools/ in a
p
a
th
with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
difftool: Use
s
ymlinks wh
e
n d
i
f
fin
g
against the
w
orktr
e
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
il
a
r
diff
t
oo
l
: Call the temp direct
o
ry "git-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool
:
M
o
ve option values into a ha
s
h
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Agui
l
ar
d
i
fftool: E
l
imina
t
e global var
i
ables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
A
g
u
ilar
d
i
fftoo
l
:
Simplify pr
i
nt_tool_he
l
p()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
Da
v
id Aguilar
t
7
8
00
:
Test dif
f
tool passi
n
g argumen
t
s to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguila
r
mer
g
etool: P
r
ovide an em
p
ty file
w
hen needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Ma
k
efile: Impr
o
ve compiler he
a
der dep
e
n
dency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetools/
m
eld: Use '--output'
w
hen available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
v
id
Aguilar
merget
o
ol--lib
:
Refactor
tools into s
e
para
t
e files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Aguila
r
mergetool--lib: M
a
ke style consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguil
a
r
difft
o
o
l--h
e
lper
:
Make style con
s
istent wit
h
git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David
Aguilar
t/t
7
503-pre
-
commit
-
h
ook
.
s
h
:
A
dd
GIT_PRE
F
IX t
e
sts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
g
it-
m
er
g
e
to
o
l-
-
l
ib
:
Make vi
m
diff
r
etain t
h
e curr
e
nt
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Aguilar
git: R
e
move handling for GIT_
P
REFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
i
lar
setup: P
r
ovide GI
T
_PREFIX to built-in
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Da
v
id Aguilar
subm
o
dule sync: Upda
t
e "submodu
l
e
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
Davi
d
A
g
uilar
mergetool: Skip autoresolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Agu
i
lar
Documentatio
n
: Explain git-m
e
rgetool
'
s use of te
m
porary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David A
g
uilar
Makefile
:
Remove usage of
d
eprec
a
ted Pytho
n
"h
a
s
_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
Dav
i
d
Aguil
a
r
difftool: Fi
x
'--gui' w
h
en diff
.
gui
t
ool is unconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
Da
v
id
A
guilar
t7800-difftool
.
sh: Test mer
g
etool
.
p
rom
p
t fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difftool:
Update copyr
i
g
h
t notices t
o
list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
A
guila
r
di
f
ftoo
l
: Use eval
t
o exp
a
nd '--
e
xtcmd' expre
s
s
i
ons
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agui
l
ar
di
f
ftool:
A
dd '-x' and as a
n
alias for '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7800-difftool
.
sh: Si
m
plify the -
-
extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d
Aguilar
git-diff
.
txt
:
Lin
k
to git-di
f
f
t
ool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguilar
d
i
f
f
tool:
A
ll
o
w specifying
u
nconfigured commands w
i
th
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
di
f
ftool--helpe
r
: Remove use of t
h
e GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
difftool-
-
helper: Update copyr
i
ght an
d
remo
v
e distract
i
ng
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
g
it-d
i
f
f
tool: Add
'
--gui' for selecting a GUI too
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David
Aguilar
t7800-difftool:
S
et a
b
o
gus
t
ool for use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Ag
u
ilar
help: Do no
t
unnecessar
i
l
y
look for
a
repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodule
.
c
: Squelch a "use before
a
ss
i
gnment" w
a
rning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff:
g
enera
t
e
p
ret
t
y fi
l
enames in
p
rep_temp_b
l
ob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguil
a
r
c
o
m
pa
t
: add a basename() compatib
i
lit
y
function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add a
m
kst
e
mp
s
(
) comp
a
tibilit
y
function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add git-
r
eplace t
o
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergetool--
l
i
b: ad
d
support
for ara
x
i
s mer
g
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
Da
v
id Aguilar
mergetoo
l
--lib: specialize diff option
s
for emerg
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Ag
u
i
l
a
r
merg
e
tool--lib
:
simplif
y
API
u
sage by remo
v
i
n
g more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agu
i
lar
dif
f
to
o
l/mergetoo
l
:
r
e
fact
o
r commands to
use g
i
t-m
e
rgetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
mergetool:
use $(
.
.
.
) instea
d
of `bac
k
t
i
c
ks
`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash completi
o
n
:
add git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
l
ar
d
i
fftool:
a
d
d support for
a
diff
t
o
o
l
.
p
rompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
difftool: add
variou
s
git-diffto
o
l tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Ag
u
i
l
ar
difftool:
mo
v
e 'gi
t
-difftool' out of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Agui
l
ar
d
ifftool: ad
d
a -y shortcut
for --n
o
-pro
m
pt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id Aguilar
difftool: use per
l
built
-
i
ns when testing for
m
sys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
dif
f
tool: remove the backup f
i
le feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: re
m
ove
m
erge options for
o
pendiff
,
tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
ever
y
day: use the dashless
f
orm of
g
it-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
D
avid
A
guilar
c
ontrib/difftool: use a
s
eparate
conf
i
g
namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Ag
u
ilar
cont
r
ib
/
dif
f
tool:
D
on't repeat merge
tool
cand
i
dates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
d
i
fftool: p
u
t
the curso
r
on t
h
e editable file for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool: fix d
o
cumentation problem
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
contrib:
add 'git difftool' for
l
a
unching common m
e
rge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
Da
v
i
d
A
g
uilar
git-
m
e
r
getoo
l
:
p
roper
l
y
han
d
le "git me
r
getool -- filename
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
D
a
vid Aguilar
tests:
a
dd a
t
estc
a
se for
"
git submodule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
D
avid Agu
i
lar
git-
s
ubmodu
l
e: add "sync" com
m
and
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguil
a
r
git-submodule: replace duplicated
c
ode wi
t
h
a module_l
i
st
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Agui
l
ar
[P
A
TCH]
g
itk: D
o
n
'
t
show lo
c
al
change
s
w
hen we
t
here
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree