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
contrib/fast-import/import-zips.py: fix broken error message
2013-02-24
D
av
i
d Ag
u
ilar
contrib/fast-i
m
port/import-zips
.
py: fix
b
r
oke
n
e
r
ror
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
cont
r
ib/fast-import: us
e
a
l
owercase
"us
a
ge:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
contrib/credential: use a
l
ow
e
rcase "usag
e
:"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Agui
l
a
r
g
i
t-
c
vs
i
mport: use a
l
owercas
e
"us
a
ge:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d A
g
uilar
git-cvsim
p
ort: use
a
l
o
werca
s
e "usage:
"
strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git-cvsexpor
t
commit: use a lowercase "u
s
age:" strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguila
r
git-archimport: use a l
o
w
e
rcase "usage
:
" str
i
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Agui
l
ar
git-merge-one-file: use a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
git
-
relin
k
: use a lowe
r
case "
u
sage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-
s
vn: use
a lowercase "
u
s
age:" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
g
i
t
-sh-se
t
up: use a lowercase "usage:
"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid Agui
l
ar
p4merge: f
i
x printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
a
v
id Agui
l
a
r
difftool--helper: f
i
x printf
u
sage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
d
oc
:
g
e
nerate
a
l
i
st of v
a
lid m
e
rge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
mer
g
etool--lib:
add functions
for f
i
nd
i
ng avai
l
able
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Agu
i
lar
mergetoo
l
--lib:
i
mp
r
ove the help text in gu
e
ss_merge
_
too
l
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Aguila
r
mergetool--l
i
b: s
i
mpli
f
y command ex
p
ress
i
ons
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
m
e
rgetools:
simplify how we
h
andle "
v
i
m
"
a
nd "defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguil
a
r
mergetool--lib: improve sh
o
w_tool_he
l
p()
output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Ag
u
ilar
m
ergetools/
v
im: remove red
u
n
d
ant dif
f
c
omman
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
D
a
vid Aguilar
merget
o
ols/p4mer
g
e: Ho
n
or
$TMPDIR for
t
he
/
dev/
n
ull
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
D
a
vid
A
guil
a
r
mergeto
o
l
s
/p4merge
:
Handle
"
/
d
e
v
/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
merge
t
oo
l
--lib: All
o
w cu
s
tom commands to ov
e
rr
i
de built
-
ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vi
d
Aguilar
gitk: Rename 'tagcontents' to 'cached_tagcon
t
ent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Da
v
id Aguilar
gitk: Teach "Reread refer
e
nces"
to reloa
d
tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David
Aguilar
m
ergetool,difftool: Document --too
l
-help c
o
nsistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Aguila
r
difftool: Disa
b
le -
-
s
y
mlinks on cyg
w
in
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguila
r
difft
o
o
l
:
H
a
ndl
e
compare() returni
n
g -
1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Aguilar
d
ifftool:
W
rap long lines for r
e
ad
a
bility
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id
A
gui
l
a
r
difftool: Check a
l
l
r
e
t
urn codes from compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
D
avi
d
A
gui
l
ar
difftool: Handl
e
finding mergetool
s
/ in a path
with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
dif
f
tool: Use
symlinks when dif
f
ing against the work
t
ree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
difftool:
C
all the te
m
p direc
t
ory "git-
d
ifftool
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Move o
p
t
i
on values into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id A
g
u
ilar
diffto
o
l: Elim
i
nate
global va
r
iables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
i
d
Aguila
r
d
ifftool: Si
m
pli
f
y
p
rint_tool_
h
elp()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David
Aguilar
t7800: Test difftool
passin
g
arguments to
d
iff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David
Agu
i
lar
me
r
get
o
o
l: Provide an empty
file wh
e
n ne
e
ded
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David A
g
uila
r
Ma
k
efile: Imp
r
ove compil
e
r header dependency
check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguila
r
mergetools/meld: Us
e
'
--ou
t
put'
w
hen a
v
a
i
la
b
le
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agui
l
a
r
merg
e
tool--lib: Refactor tools into separat
e
f
iles
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uilar
m
e
rg
e
to
o
l-
-
lib: Make st
y
le cons
i
stent wi
t
h git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
u
ilar
diff
t
o
o
l
--helper:
M
ake style consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguil
a
r
t/t7503-pre-commit-hook
.
sh: Add GIT_PREFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
u
i
l
a
r
git-mergetool--lib:
Make vimd
i
ff retain the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David
Aguilar
git
:
Remove
h
an
d
l
ing for
GI
T
_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Agu
i
lar
setup: Pr
o
vide GIT_PRE
F
IX to
built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
D
a
vid Aguila
r
submodul
e
s
y
n
c
:
Update "submodule
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David
Aguil
a
r
m
erg
e
tool: Skip a
u
toresolved p
a
ths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David
A
guilar
Documentat
i
o
n: Explain
g
it-mergetool's
use of t
e
m
p
o
rary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
D
a
v
i
d Aguilar
Makefile: R
e
move usa
g
e
of de
p
recat
e
d Python "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
D
avid
A
guilar
diff
t
oo
l
: Fix '--gui' when
d
i
ff
.
guitool is unconfigure
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
Dav
i
d Aguilar
t78
0
0-difftool
.
sh: Test m
e
rget
o
ol
.
prompt f
a
l
l
back
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
avid Aguilar
diffto
o
l: Update co
p
yri
g
ht notices
t
o li
s
t
e
ach year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uila
r
difftool: Us
e
eval t
o
e
x
pand '--extcmd' express
i
ons
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agu
i
lar
difftool: Add '-x' and as an
alias for
'
-
-extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
ilar
t7800-difftoo
l
.
sh: Sim
p
l
i
fy the --extc
m
d
tes
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-diff
.
txt
:
Link to git-di
f
ftoo
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Aguilar
difft
o
ol: Allow specif
y
ing unconfigure
d
comm
a
nds with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
diffto
o
l--helper: Remove use of the GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
di
f
ftool--help
e
r
:
U
pdate
copyright
and
remove
d
istracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David
A
guil
a
r
git-
d
ifftool: Add '--gui' for sele
c
t
ing a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Agui
l
a
r
t
7800-difftool: Set a bo
g
us tool for use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help: Do not un
n
ecessarily lo
o
k
for a
re
p
osito
r
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
D
a
v
i
d
Agui
l
a
r
submodule
.
c
:
Squelch a "
u
se befo
r
e ass
i
g
nment" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
v
i
d
A
g
u
ilar
diff: gene
r
ate pretty
filen
a
m
e
s
in pr
e
p_temp
_
blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
com
p
at: add a basename() comp
a
ti
b
il
i
ty func
t
ion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agui
l
ar
compat: add a mkstem
p
s() compat
i
bility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add git-
r
eplace to
.
gi
t
ignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergetool--lib: add s
u
ppo
r
t for araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
me
r
ge
t
ool--
l
ib:
s
p
e
ci
a
lize diff options for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
avid Aguilar
mergetool--
l
ib: simplify API usage by remo
v
ing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difft
o
ol/mergetool: refa
c
to
r
comma
n
ds
to use git-mergetoo
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
mergetool: u
s
e
$
(
.
.
.
) instead of `backtick
s
`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash
c
o
mple
t
ion: add git
-
di
f
f
tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
dif
f
tool: add support for a
d
i
f
ftool
.
prom
p
t co
n
fig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftool: add various gi
t
-di
f
ftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
av
i
d Agui
l
ar
difftool: mo
v
e 'git-difftool' out
o
f
c
ontrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
to
o
l
:
ad
d
a
-
y shortcut f
o
r --no-p
r
o
mpt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguila
r
difftool: use
p
erl b
u
ilt-ins when testing for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
diff
t
ool:
r
emove the
backup f
i
l
e
f
e
a
ture
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difft
o
o
l
:
r
emov
e
merge o
p
tions for opendiff, tkdif
f
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
everyday: use
the
dashless form
of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David A
g
uil
a
r
contrib/difft
o
ol: us
e
a separate con
f
ig namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
cont
r
i
b
/difftoo
l
:
D
on't repeat
m
erge tool
c
andida
t
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Agu
i
lar
d
i
ff
t
ool: put t
h
e cursor on the ed
i
table fi
l
e
for Vi
m
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Davi
d
Aguilar
difftoo
l
: fix doc
u
mentation problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
D
avid Aguilar
contrib: add 'git
difftool' for launching
c
o
m
m
on merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Ag
u
ilar
g
i
t
-mergetool: proper
l
y handle "git mergetool --
filename
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tes
t
s: add a te
s
t
case
f
or "git submodule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
D
avid Aguila
r
gi
t
-submodule: ad
d
"sync" comma
n
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Agui
l
ar
git-su
b
module: repla
c
e
duplic
a
ted
code with a mod
u
l
e_l
i
st
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PATCH] gitk: Don't show lo
c
al changes when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree