repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool: fix dir-diff when file does not exist in working tree
2013-05-09
D
avid Agui
l
ar
mergetools/kdiff3: do
not use --auto when diffin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
D
a
vid Ag
u
ilar
h
e
lp
.
c: add a c
o
m
patibility
c
o
mment to c
m
d_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib/mw
-
to-g
i
t/t
/
install-wiki
.
sh: u
s
e a
l
owercas
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Agu
i
l
a
r
con
t
rib/example
s
/git-
r
emote
.
per
l
:
use a lower
c
ase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Agui
l
ar
tests: use a
l
o
wercase "usa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
git-svn:
u
se a lo
w
er
c
ase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Ag
u
ilar
Documentation
/
use
r
-
m
anual
.
t
xt: use a l
o
wer
c
ase "
u
sage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
templates/hoo
k
s--update
.
sample: use a lower
c
ase "us
a
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
contrib/hoo
k
s/s
e
t
g
itperms
.
p
erl:
u
se a lowercase "usag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d Aguilar
cont
r
ib/e
x
amples: use a lowercas
e
"usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguila
r
c
o
ntrib/fast-
i
mp
o
r
t/imp
o
r
t
-zips
.
py:
u
s
e spac
e
s
i
nstead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contr
i
b
/
fast-
i
m
p
ort/import-z
i
p
s
.
py: fix broken error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Agui
l
ar
contri
b
/fast-
i
mpo
r
t: use a
l
o
w
ercas
e
"usage:" st
r
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
contrib
/
credential:
u
se
a l
o
wer
c
ase "usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
git-cvsimport
:
use
a
lower
c
ase "us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
g
it-cvs
i
mport
:
use
a
lowe
r
case "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
g
i
t
-
cvse
x
port
c
o
m
mit: u
s
e
a lo
w
ercase "usa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguila
r
g
it-archimport: use a lowercase "
u
sage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-merge-one
-
file: use
a
lowerc
a
se "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Ag
u
ilar
git-relink: use a l
o
w
e
rc
a
se "usa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
uila
r
g
it-svn: use a low
e
rca
s
e "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d
A
g
uilar
g
i
t-sh-setup: us
e
a lowercase
"
u
sage:" s
t
r
in
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Agu
i
la
r
t7800
:
"d
e
faults" is
no longer a builtin tool
name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800:
modernize
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David
A
g
u
ilar
t780
0
: update copyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David A
g
u
i
lar
difftool:
s
ilence uni
n
i
t
ialized variable warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David A
g
uilar
p4merge: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
di
f
ftool
-
-helper: f
i
x printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguil
a
r
doc:
g
ene
r
a
t
e
a list of
v
alid merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
mergetool--lib: add
f
unctions for finding available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Ag
u
ilar
merg
e
tool-
-
l
ib: improve the
h
elp
t
e
xt in
g
uess_merge_
t
ool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
m
er
g
etool--lib:
s
i
mplify com
m
and ex
p
ressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id Aguil
a
r
mergetools
:
simplify h
o
w
w
e handle
"
vim" and "defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid Aguilar
mergetool--lib: imp
r
ove show_tool_help() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Da
v
id Aguilar
mergeto
o
ls
/
vi
m
:
re
m
ov
e
redundant di
f
f
command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
Davi
d
Aguilar
merget
o
ols/p4merge: Honor
$TMPDIR for the /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Ag
u
ilar
mergetools/p
4
merge: Ha
n
dle "/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David
Aguilar
mer
g
etoo
l
-
-lib
:
Allow
custom commands to override built-in
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David A
g
uilar
gitk: Rename 'tagcontents' to 'cach
e
d_tagc
o
ntent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d Aguilar
git
k
: Teach "
R
e
rea
d
re
f
eren
c
es" to
r
e
load tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
mer
g
etool,
d
ifftool: Do
c
umen
t
--tool-help consiste
n
tly
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Agu
i
lar
di
f
ftool: Disable --symlinks on
c
y
gwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
dif
f
tool:
Han
d
l
e
c
o
mpare() r
e
turning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
A
g
uilar
difft
o
ol
:
Wrap long lines
f
or re
a
dab
i
lity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Agui
l
a
r
difftool: Check al
l
retur
n
codes
f
rom compar
e
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David
Aguilar
d
ifftool:
Ha
n
dle finding m
e
rgetools/ in a
pa
t
h with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguilar
d
i
ffto
o
l: Use
symlinks
wh
e
n
diffing
a
gai
n
st
t
he worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid
Aguilar
difftool:
C
all the temp
directory "g
i
t
-di
f
ftoo
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
u
il
a
r
difftoo
l
: Mo
v
e op
t
ion values in
t
o a
hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguil
a
r
difft
o
ol: Eliminate
glo
b
al va
r
iables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Agu
i
lar
diff
t
ool: S
i
mplify print_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
Dav
i
d Aguilar
t780
0
:
Te
s
t di
f
f
tool p
a
ssing argumen
t
s to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
Dav
i
d Aguilar
merg
e
tool: Prov
i
d
e
an empty file when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David
Ag
u
ilar
M
akefi
l
e
:
Improve c
o
mpi
l
er header
d
e
pende
n
c
y check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
av
i
d
Aguil
a
r
me
r
g
e
t
ools/meld:
U
s
e
'--ou
t
put' when availabl
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merget
o
o
l
--lib: Refacto
r
tools into separate file
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
l
a
r
mer
g
etool--lib: Make style co
n
sis
t
ent with
g
i
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
A
guilar
d
ifftool--helper: M
a
ke style consisten
t
wit
h
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t7503-pre-commit-hook
.
sh
:
Ad
d
GIT
_
PREFIX
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
g
i
t-mer
g
etool-
-
l
ib: Make vimdiff retain the cur
r
en
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Agui
l
ar
g
it: Re
m
ove handling
for GIT
_
PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id Aguila
r
s
e
tup
:
Pro
v
ide GIT_PREF
I
X to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
D
avid Aguilar
submo
d
ule
s
ync:
Upda
t
e "submodule
.
<name>
.
u
rl"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David
A
g
uilar
merget
o
ol: Skip
autoresolved
paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Documen
t
ation: Ex
p
lain git-m
e
rgetool's use of tem
p
orary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David
A
g
u
il
a
r
Makefil
e
: Remove usage of de
p
r
e
c
a
ted Py
t
hon "
h
as_ke
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Dav
i
d Aguilar
difftool: Fix
'--gui' when diff
.
guitool is u
n
c
onfig
u
r
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
a
vid Aguilar
t7800-difftool
.
sh: Test me
r
getool
.
prompt fallba
c
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
D
avid
A
guilar
difftool: Updat
e
copyright notices to l
i
st
each yea
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
ilar
difftool: Use
eval to expa
n
d
'--
e
xtc
m
d' expressi
o
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uilar
difftool: A
d
d
'-x' and as
an
a
l
i
as for
'
-
-
extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
Agu
i
lar
t7800-
d
ifftool
.
sh: Simp
l
i
f
y
the --ext
c
md te
s
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Agui
l
ar
g
it
-
dif
f
.
txt: Link to git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
v
i
d Ag
u
ilar
diff
t
o
o
l:
Allow specifying u
n
configu
r
ed
c
o
m
m
an
d
s w
i
th
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Aguilar
diff
t
ool--helper: Remove use of the
G
IT
_
MER
G
E_
T
OOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
g
uil
a
r
difftool--
h
elper: Update copyright an
d
r
e
move distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
A
g
uilar
git-diff
t
oo
l
: Add
'--gui'
f
or sele
c
ting a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id Agui
l
ar
t
7800-difftool:
Set a bogus
tool
f
or use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
Da
v
i
d Aguilar
help:
D
o not unnecessarily look for a
r
e
pository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
D
a
vid
A
guilar
submodule
.
c: Squelch a "use before as
s
ignment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
d
i
ff: gen
e
rate pretty filenames in prep_temp
_
bl
o
b
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
ilar
com
p
a
t: add a
basename
(
)
c
o
mpatibility funct
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id A
g
ui
l
ar
compat: add a mk
s
temps()
compatibilit
y
function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add
git-replace t
o
.
git
i
gnore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Ag
u
il
a
r
m
erget
o
ol--lib:
add sup
p
ort fo
r
araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David
Ag
u
ilar
mergetool--lib: specialize diff options for
e
merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
me
r
g
e
too
l
--l
i
b
:
simpli
f
y API u
s
a
ge b
y
removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Agui
l
ar
difft
o
ol/mergetoo
l
: refac
t
or
command
s
to
u
s
e
git-merg
e
tool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
merg
e
tool: use $(
.
.
.
) i
n
stead of `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
bash
c
omple
t
ion: add git-
d
ifftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
ifftool: add support for a
d
ifftool
.
prompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguil
a
r
dif
f
tool:
a
dd va
r
ious git-difft
o
ol tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
la
r
diff
t
ool:
m
ove 'gi
t
-difftool
'
o
u
t of
c
on
t
rib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
il
a
r
difftool: add a -y shortc
u
t for --no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
di
f
ft
o
ol: use perl built-ins when tes
t
ing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
gu
i
lar
d
iffto
o
l
:
remove the backup file fea
t
u
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
t
o
ol: remove merge
opt
i
ons for o
p
endiff,
t
kdif
f
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David
A
guilar
everyday
:
u
se the da
s
hles
s
form of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
Da
v
id Aguil
a
r
contrib
/
difftool: use a
separate co
n
fig namespace
f
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
Da
v
id
Agui
l
ar
c
o
n
trib/
d
ifftool
:
Don't repea
t
me
r
g
e
t
ool candidat
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next