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
doc: generate a list of valid merge tools
2013-02-03
David Aguilar
doc: generate a
l
ist
o
f valid merge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
m
e
r
geto
o
l
-
-l
i
b:
a
dd f
u
nction
s
for fi
n
d
ing available
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
Aguilar
mergetool--lib:
im
p
rove the help
t
ext in guess_merge_t
o
ol()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d
A
gui
l
ar
mergetool--lib: simplify command expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
m
ergetool
s
: simplify how w
e
h
andle "
v
im
"
and
"defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguil
a
r
merg
e
t
o
ol--li
b
: improv
e
sh
o
w
_
too
l
_
hel
p
()
o
utput
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
me
r
g
etool
s
/vi
m
: remov
e
redunda
n
t diff command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
Davi
d
Agui
l
ar
mergetool--lib: Allow cu
s
tom
c
ommands t
o
override
built-
i
ns
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Rename 'tagcontents' to
'cached_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d Ag
u
ila
r
gitk:
T
each "Reread referen
c
es" to
r
eloa
d
tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
Da
v
id Aguilar
mer
g
e
too
l
,difftool: Document
-
-tool-help con
s
i
s
te
n
tly
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id Aguilar
difftool
:
D
isabl
e
--symlinks
o
n cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
uilar
d
ifft
o
ol: Handle compare(
)
returning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
di
f
ft
o
ol: Wrap
long l
i
nes
for readability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d Aguilar
difftoo
l
: Chec
k
all return codes from compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id A
g
uilar
difft
o
ol: Ha
n
dle finding mergetools
/
in a path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d
Aguil
a
r
d
i
f
f
tool: Use symlinks when
d
iffing again
s
t the worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
dif
f
too
l
: Call
the temp di
r
ectory "gi
t
-difftoo
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
d
i
fftool: Mov
e
option
value
s
i
n
to a
hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
dif
f
to
o
l: Eli
m
inate
g
lobal
variables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
difftool: Si
m
p
l
ify print_to
o
l_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David
Agui
l
a
r
t
7
800: Te
s
t difftool passing arguments to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
m
e
r
geto
o
l: Prov
i
de an empty file whe
n
needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
Dav
i
d Ag
u
ilar
Makef
i
le: Improve com
p
iler he
a
der depen
d
e
ncy
ch
e
c
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Aguilar
mergetools/
m
eld: Use '--outp
u
t
'
when available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--lib: Refactor
t
ools into sepa
r
a
t
e
files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avi
d
Aguilar
mergetool-
-
l
i
b: Mak
e
sty
l
e co
n
sistent
w
it
h
git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
Aguilar
d
ifftoo
l
-
-help
e
r: Ma
k
e style consist
e
nt
w
ith g
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
Da
v
id Aguilar
t/t7503-pre-commit-hook
.
sh: Add GIT_PRE
F
IX
t
ests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-mer
g
etool--lib: M
a
k
e v
i
mdiff
retain
the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
av
i
d Agui
l
ar
gi
t
:
R
e
move h
a
n
d
l
i
n
g
for GIT_PREFI
X
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David
A
guilar
set
u
p: Pro
v
i
de
GIT
_
PREFI
X
to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
D
a
vid Aguilar
s
ubmod
u
le
s
y
n
c: Update "submod
u
le
.
<
nam
e
>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
D
a
vid Ag
u
ilar
merget
o
ol: Skip autore
s
olved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
D
a
vid Aguilar
Do
c
ume
n
tation: Exp
l
ain gi
t
-mergetool's
u
se
o
f tempo
r
a
ry
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
D
a
v
i
d
A
gui
l
ar
Make
f
i
l
e: Rem
o
ve usage of deprecated Pyt
h
on "has_ke
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
Da
v
id Aguilar
diff
t
ool:
F
ix '--gui'
when diff
.
guitool is unconfigure
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Ag
u
il
a
r
t7800
-
difftool
.
sh: Te
s
t me
r
g
e
tool
.
p
r
o
mpt fallba
c
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
d
i
fft
o
ol: Updat
e
copyrig
h
t
notice
s
to list each y
e
ar
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
Agui
l
ar
diffto
o
l: Use eval to expand '--extcmd' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguil
a
r
d
i
f
ftool:
A
dd '-x' and a
s
an ali
a
s for
'
--extcmd
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguilar
t7800-d
i
fftool
.
sh: Simplify the
-
-extc
m
d
test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-
d
if
f
.
txt: Link to git-dif
f
tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Aguila
r
d
ifftool:
Allow spec
i
fying unco
n
fi
g
u
red co
m
m
ands w
i
th
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Agu
i
l
a
r
dif
f
tool--
h
e
lper: Remove u
s
e
of the GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avi
d
Ag
u
i
lar
difftool--helper
:
Update
copyri
g
ht and
r
emove
distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
avid Agui
l
ar
gi
t
-difftool:
A
dd '--gu
i
'
f
or selectin
g
a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David
A
guilar
t7800-difftool: Se
t
a
b
o
gus tool for use by tes
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
D
avid Aguilar
help: Do no
t
unneces
s
aril
y
look for a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David
A
guilar
submodule
.
c: Squelch a "use before assi
g
nmen
t
"
warnin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Aguilar
diff: gen
e
rate pretty filenames i
n
p
r
ep_tem
p
_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
il
a
r
com
p
at
:
add a b
a
sena
m
e
(
)
c
ompatibi
l
ity func
t
ion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
ilar
compat
:
add a mkstemps(
)
co
m
pati
b
i
lity function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
A
dd g
i
t-replace to
.
g
i
tign
o
re
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
Dav
i
d
Aguilar
m
erge
t
ool--lib
:
add s
u
pp
o
rt for araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
Da
v
id Aguil
a
r
merget
o
ol--lib: spec
i
alize diff o
p
t
i
ons for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
me
r
g
e
too
l
--
l
ib: simplify API us
a
ge by removi
n
g more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ftool/mer
g
etool: refacto
r
comman
d
s to use git-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
mer
g
e
to
o
l: use $(
.
.
.
) ins
t
ead of `back
t
icks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
b
a
sh
completion:
ad
d
g
i
t-difft
o
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add su
p
port for a difftool
.
prompt conf
i
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftoo
l
: add
v
a
r
ious git-difftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id
Aguilar
di
f
ftool: move 'git-difftool' out of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid
A
guila
r
difftool: add a -y shortcut f
o
r --no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Ag
u
ilar
diffto
o
l: use perl built
-
in
s
when testing for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id Agu
i
lar
difftool:
remove the b
a
ckup file fea
t
ure
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
av
i
d
Aguilar
di
f
ftool: r
e
mo
v
e merge op
t
ions
f
o
r opendiff, tkdi
f
f
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Ag
u
ilar
eve
r
yday: use the dashle
s
s
form of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
D
a
v
id Aguilar
c
o
ntrib/difftool: use a separate config
n
ame
s
pace
f
or
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
D
a
v
id Aguilar
contrib/difft
o
ol: Do
n
't re
p
e
a
t
merge tool candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
d
i
fftool: put the curso
r
on th
e
editable file f
o
r
Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David
A
gui
l
ar
difftool: fix documentat
i
on probl
e
ms
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
co
n
t
r
ib:
a
dd '
g
it
difftool' for launch
i
ng common m
e
rge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David
Aguilar
git-merge
t
ool: proper
l
y hand
l
e "
g
i
t
mergetool
-
- filen
a
m
e
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
D
avid Aguilar
tests: add
a testcase for
"
git
s
ubmodule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git-
s
ubmodule: add "s
y
nc" c
o
mman
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git
-
sub
m
odu
l
e:
rep
l
ace
duplicat
e
d
c
o
de with a
mo
d
u
le_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
D
a
vid Aguilar
[PATCH
]
git
k
: Don
'
t show local c
h
anges
wh
e
n we th
e
re
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree