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
contrib/credential: use a lowercase "usage:" string
2013-02-24
D
a
vid Ag
u
ila
r
contrib/credential: use a
l
owercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Agu
i
lar
g
i
t-cvs
i
m
port: us
e
a l
o
wercase "usag
e
:"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
a
r
gi
t
-c
v
simport: use a lowe
r
c
a
s
e "usage:
"
strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
g
it-cvsexpor
t
commit: use a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-arch
i
mport: use a lowe
r
case "
u
sa
g
e:
"
strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Ag
u
ilar
git
-
merge-one-f
i
le:
u
se
a lowercase "usage:" s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
git-relink: use a
lowercase "us
a
ge:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
git
-
svn: use a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git-
s
h-setup: u
s
e a lowercase "usage:"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
Dav
i
d Agu
i
lar
p
4
merge
:
fix p
r
i
n
tf usa
g
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David
Agui
l
ar
d
i
f
f
t
ool--helper: fix
p
rintf
usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid
A
guila
r
doc: generate a lis
t
of v
a
lid me
r
ge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
Davi
d
Ag
u
ilar
mergetoo
l
-
-
lib: add functions for finding ava
i
l
able
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
m
e
r
get
o
ol--l
i
b:
impr
o
ve
t
he h
e
l
p
text i
n
gues
s
_
merge_
t
ool(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
Aguilar
merge
t
ool-
-
lib:
simplify command
e
xpr
e
ssions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
i
d
Aguilar
m
e
rgetools: s
i
mpli
f
y
how
we handle "vim
"
and
"
defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid Ag
u
ilar
mergeto
o
l--lib: imp
r
ove show_tool_help
(
) outp
u
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Ag
u
ilar
m
e
rgetoo
l
s/vim: remove redundant di
f
f command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
Da
v
id Ag
u
ilar
m
erge
t
o
o
l
s
/p4merge: Honor $
T
M
P
DIR f
o
r the /dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
me
r
getools/p4m
e
rge: Handle "/dev/nu
l
l"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
D
avid Aguilar
mergetool--l
i
b: Allow cus
t
om command
s
to override built
-
ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguil
a
r
gitk: Rename 'tagcontents' to '
c
a
ched_ta
g
cont
e
nt'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Ag
u
ilar
gitk: Teach "Reread referenc
e
s" to reload tag
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
mergetool,diff
t
ool:
Document --tool-hel
p
consisten
t
ly
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id Agu
i
lar
di
f
fto
o
l: Disa
b
le --symlinks on cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
i
d Ag
u
ilar
difftool: Handle com
p
are
(
) returning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
avid Aguil
a
r
difftool:
Wrap long lines
f
or readability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftoo
l
: Che
c
k
a
ll return codes from compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id Aguilar
dif
f
tool: Handle f
i
nding mergeto
o
ls/ i
n
a pat
h
with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
diff
t
o
o
l
:
Use
s
y
m
lin
k
s
when diffin
g
against the worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Ag
u
il
a
r
d
i
ff
t
o
o
l
:
C
all the
t
emp d
i
rectory
"
g
it-diff
t
ool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
id Aguilar
difftool: Mo
v
e option value
s
into a
hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
d
i
fftool: Eli
m
inate glo
b
al
v
ariables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Ag
u
ilar
di
f
ft
o
ol: Simpli
f
y print_tool_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
Davi
d
Aguilar
t7800: Test
d
ifftool pass
i
ng arguments to
diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
mergetool: Pro
v
ide an
e
mp
t
y file when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
Dav
i
d Aguil
a
r
Ma
k
efile: Improv
e
co
m
piler header
de
p
endency c
h
eck
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Agui
l
ar
mergetools/meld: Use '--outp
u
t
'
when available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
mergetool--lib
:
Ref
a
ctor tools
int
o
s
e
p
ara
t
e
files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avid
Aguilar
merg
e
tool--lib: Make style
c
o
ns
i
stent
with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
diffto
o
l--h
e
lper: Make st
y
le
c
onsis
t
ent wi
t
h git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Agu
i
lar
t/t7503-pre-commit
-
hook
.
s
h
: Add GIT_PREFIX t
e
sts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
avid
A
guil
a
r
g
i
t-mergetool
-
-lib
:
Make vimdif
f
retain the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Aguilar
git:
R
emove handling for GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setup:
P
rovide GIT_P
R
EFIX to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Davi
d
Aguilar
submodul
e
sy
n
c: Update "submodule
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
mergetool:
Sk
i
p autor
e
solved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Davi
d
Aguil
a
r
D
ocumentatio
n
:
Exp
l
ain gi
t
-
mergetoo
l
's use of
temporar
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David A
g
u
i
l
a
r
M
a
kefile:
Remo
v
e usage
o
f
d
eprecated Python "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
dif
f
tool:
Fix '-
-
gui'
w
hen diff
.
guito
o
l is unconfigure
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguil
a
r
t7800-difftool
.
s
h
: Test m
e
rgetool
.
prompt f
a
llbac
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difftool: Update co
p
yright notices to l
i
st each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
di
f
ftool: Use eval to expand '-
-
extcmd
'
express
i
ons
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id
A
guilar
difftool: Add '
-
x'
a
nd as an alias for '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
A
guilar
t7800-difftool
.
s
h: Simplify
t
he --extcmd t
e
st
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
ilar
git-diff
.
t
xt: Link to git-difftoo
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
il
a
r
diff
t
ool: Allow specify
i
ng unconfigured
commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id
Aguilar
difftoo
l
--helpe
r
: Remove
use of the GIT_MERG
E
_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
di
f
ftool
-
-helper: U
p
d
a
t
e copyright and remove
distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-difftool
:
Add '--gui' for se
l
ec
t
ing a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid
Aguil
a
r
t7800-difft
o
ol: Set a bogus to
o
l
f
or use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help: Do
n
ot
u
n
n
e
cessar
i
ly loo
k
for a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
D
a
v
i
d Aguilar
submod
u
le
.
c: Sq
u
elch a "u
s
e before assignment" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid
Agu
i
l
a
r
d
iff:
gener
a
te
pretty
f
ilenames in pre
p
_tem
p
_bl
o
b()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add a basename()
c
o
m
patibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Aguilar
compat: add
a
mk
s
tem
p
s() compatibi
l
ity function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
Add
git-
r
epl
a
ce to
.
g
i
tignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergetool--lib: add s
u
pport for araxis mer
g
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David A
g
uilar
mergetool
-
-lib: specia
l
i
z
e diff opt
i
ons f
o
r emerg
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
m
ergetool--lib: simplify
A
PI usage by removi
n
g
m
ore
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftoo
l
/me
r
ge
t
ool: ref
a
ct
o
r command
s
to
use git-
m
ergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
A
guila
r
mer
g
etool: use $(
.
.
.
) inst
e
ad of `ba
c
kticks
`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid
Agui
l
ar
b
a
sh completion: add git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Ag
u
ila
r
difft
o
o
l: add suppor
t
for a dif
f
tool
.
pro
m
pt co
n
fig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Ag
u
ilar
d
i
fftool: add v
a
rious git-difftool t
e
sts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vi
d
Aguilar
dif
f
tool: move
'git-difft
o
o
l' out of con
t
rib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftool:
add a -y
s
hortcut for --no-promp
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agu
i
lar
d
i
fftoo
l
: us
e
perl built-ins wh
e
n testing for m
s
ys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id A
g
u
i
l
a
r
d
i
f
ftool: r
e
mov
e
the b
a
ckup file fea
t
ure
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difft
o
ol: re
m
ove merge options
f
or opendiff, tk
d
iff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Agui
l
ar
every
d
ay: use the dashle
s
s form of
git-in
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
c
o
n
t
rib/difftool: use a separate conf
i
g
n
a
m
e
space for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
con
t
r
i
b
/difft
o
ol: Don't repeat merg
e
tool candi
d
ates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David A
g
u
i
lar
difft
o
ol: put th
e
cursor
o
n
the editable f
i
le fo
r
Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Dav
i
d Aguilar
d
i
f
f
t
oo
l
: fix documentation proble
m
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
Da
v
id Aguilar
contr
i
b:
add 'git d
i
ffto
o
l'
f
o
r launching common
m
erge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
Da
v
id Aguilar
g
it
-
mer
g
etool
:
pro
p
erly handle
"git mergetool -- filen
a
me"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
t
e
sts:
a
d
d a tes
t
case for "git submodu
l
e sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git-su
b
module: add "sync" c
o
m
m
and
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-
s
ubmodule: replace
d
uplica
t
ed code with a module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PATCH
]
git
k
: Don't show local chan
g
es when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree