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
mergetool--lib: improve show_tool_help() output
2013-01-28
D
avid
A
guila
r
me
r
getool
-
-lib:
imp
r
ove
s
how
_
tool_help() output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Dav
i
d A
g
uila
r
merg
e
tools
/
v
i
m: remove redun
d
ant diff command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David
A
g
u
ilar
mergetool--li
b
: A
l
l
ow cus
t
om commands to
ove
r
r
ide built-in
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David A
g
u
ilar
gitk
:
Re
n
a
m
e
'tag
c
ontents' to 'cached_tagcont
e
nt'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
g
itk: Teach "Reread
references"
to
r
eload tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David
Agu
i
lar
merget
o
ol,difftool: Docum
e
nt --tool-help consisten
t
ly
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Agu
i
l
a
r
d
i
ff
t
ool: Disable --symlink
s
on cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Handle compare() returnin
g
-1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David
A
guilar
diff
t
o
ol: Wrap
l
o
ng l
i
nes fo
r
reada
b
ilit
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
D
a
vi
d
Aguila
r
d
ifftool:
Check all return c
o
d
es
f
rom compar
e
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
d
i
fftool: Handle finding
m
ergetools/ in a p
a
th
with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d A
g
uilar
difftool: Use symlin
k
s when d
i
ffing against t
h
e w
o
rktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
di
f
fto
o
l: Call the
t
emp
directory
"
git-difftoo
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Mo
v
e option values
i
nto
a
hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguila
r
difftool: Elimin
a
te global
v
a
ria
b
les
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
ifft
o
o
l: Si
m
plify print_tool_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
D
a
v
i
d
Aguilar
t7800: Test difftool
passing
argu
m
e
n
ts to
d
iff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
D
a
vid Ag
u
ilar
merge
t
ool: Pro
v
id
e
an empty
f
i
le when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
Da
v
i
d Agu
i
lar
Makefile: Im
p
r
o
ve
compiler header
d
ependenc
y
c
h
eck
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Ag
u
ilar
mer
g
etools/meld: Use '--output'
w
h
en available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--
l
ib
:
R
e
factor tools in
t
o separa
t
e
f
iles
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
ui
l
a
r
mergetool--lib: Make style consistent with
g
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
d
ifftool--helper: M
a
ke style consiste
n
t wit
h
git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
D
avi
d
Aguila
r
t
/t7503-pre-commit-hook
.
s
h: Add GIT_PREF
I
X
tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git
-
merget
o
o
l
-
-l
i
b: Make vimdif
f
retain the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
g
i
t: Re
m
ove handl
i
ng for GI
T
_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Agui
l
a
r
setup: Provide GIT
_
P
R
EFIX
t
o built-in
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submod
u
le sync:
Update "submodule
.
<name>
.
u
r
l"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
Dav
i
d Aguilar
mergetool: Skip autoreso
l
ved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Documentation:
E
xpl
a
in
g
it-
m
erg
e
to
o
l's use of temp
o
rary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefile: Remove
usage of
d
epreca
t
ed
Python "has_k
e
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
Da
v
id Ag
u
ila
r
diffto
o
l
:
F
i
x
'--gui' wh
e
n
dif
f
.
gu
i
tool is unconfig
u
r
ed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800-di
f
ftool
.
sh: Test mergetool
.
prompt
f
a
ll
b
ack
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Agui
l
ar
diff
t
ool:
U
pdate co
p
yrig
h
t
no
t
i
ces
to list each y
e
ar
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguilar
diff
t
ool: Use eval t
o
expand '--extcmd' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
ilar
difft
o
ol: Add '-x' a
n
d a
s
an ali
a
s for '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7800-difftool
.
sh:
Si
m
pli
f
y the --e
x
tc
m
d
te
s
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-diff
.
txt: Link to git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Aguilar
d
i
fftool: Allow
s
p
ecifying u
n
con
f
igured co
m
man
d
s
with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
ilar
dif
f
tool--helper: Remove use of
t
h
e
GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
u
i
la
r
di
f
ftoo
l
-
-
helper:
Upd
a
te copyright and
re
m
ove distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-difftool: Add '--gui' for
sele
c
ting
a
GUI
t
ool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7800-
d
ifftool: Set a bogus too
l
fo
r
u
se by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Agu
i
lar
help:
D
o not
u
n
n
ecessarily
l
ook for a reposi
t
ory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
D
a
v
i
d
Aguilar
submodule
.
c: Squelc
h
a
"use befor
e
assignment" warni
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vi
d
Aguila
r
di
f
f:
g
enerate pret
t
y filenames
i
n
p
r
ep_temp_blo
b
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
v
id
Aguilar
comp
a
t: add a basename
(
) co
m
pat
i
bility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
c
ompat: add a mkstemps(
)
co
m
patibility fu
n
ction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add
g
it-replace to
.
g
i
t
i
gn
o
r
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mer
g
etool--l
i
b
:
add
s
up
p
ort for araxis m
e
rge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David
Aguilar
m
e
rgeto
o
l-
-
lib:
speci
a
lize d
i
ff opt
i
ons for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetool--
l
i
b
: s
i
mplify API usage by re
m
o
v
ing
m
ore
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguila
r
difftool/merget
o
ol: refacto
r
commands to use
g
it-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
u
ilar
mergetoo
l
: use
$(
.
.
.
) instead of `backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguil
a
r
ba
s
h completion:
a
dd
g
it-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguil
a
r
difftool: add support
for a difftool
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
tool: a
d
d
v
arious git-difftool tes
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: move
'git-
d
ifftool'
o
u
t
of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
difftool
:
a
dd a -y
s
hortcut for --no-prom
p
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
uilar
difftool: use
p
e
rl built-ins wh
e
n
t
esting fo
r
m
sys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftool: remove the bac
k
u
p file feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
difftool: remov
e
merge o
p
t
i
ons for opendiff,
tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
ever
y
day: use the
d
as
h
less form of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguila
r
contrib
/
dif
f
t
ool: use a se
p
arate c
o
nfig name
s
pace fo
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
contrib/difftool
:
Don't
r
e
pea
t
merge tool candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
di
f
ftool: put
the cursor on the
editable file for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Dav
i
d Agui
l
ar
d
i
f
f
t
ool: fix d
o
cumentation problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
Da
v
id Aguilar
contrib: add 'git difftool'
for la
u
n
ching co
m
mon
m
erge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
D
avid Aguilar
git
-
mergetoo
l
: prop
e
rly ha
n
dle "git
m
ergeto
o
l
-- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
D
avid
A
guilar
te
s
t
s
: add
a
testc
a
se
f
or
"
git subm
o
d
u
le sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Agui
l
ar
git-submod
u
le: add "sync" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Ag
u
i
l
a
r
git-submo
d
ule:
r
eplace duplicat
e
d code wi
t
h a
m
odule_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PATCH] g
i
tk: Don't sho
w
local
c
hanges when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree