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: add functions for finding available tools
2013-02-03
David Aguilar
mergetool
-
-lib: add functions for fin
d
ing avail
a
b
le
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
m
e
rge
t
ool--li
b
: improve th
e
help text in guess_merge_tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid
A
guilar
mergetool--l
i
b: simplify command expre
s
s
ions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergeto
o
ls
:
s
i
mplify how we han
d
le "vim" and "defaults
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Dav
i
d Aguilar
me
r
getool--
l
ib: improve show_to
o
l
_help()
output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Dav
i
d Aguilar
mer
g
etools/vim: r
e
m
o
ve redundant di
f
f command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
Davi
d
A
g
u
ilar
m
e
rgetool-
-
lib: Allow custom comm
a
nds to
o
verrid
e
built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
avid
Aguila
r
gitk
:
R
en
a
me '
t
agcontent
s
' to 'cached_t
a
gcon
t
ent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
a
v
i
d Agui
l
ar
gitk: Teach
"
R
e
read r
e
ferences" to
r
eload tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
mergetool,difft
o
ol: Document --too
l
-help
c
onsistent
l
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguil
a
r
diffto
o
l: D
i
sable --sy
m
links on
cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid Ag
u
i
l
ar
difftool: Handle co
m
pare() returning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
A
guilar
difftool: Wrap long
l
ines fo
r
rea
d
a
b
ility
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguil
a
r
d
ifftool: Che
c
k
a
ll r
e
turn codes f
r
o
m
compare
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
diffto
o
l
:
H
andle finding mergetools/ in
a path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
di
f
ftool:
U
se symlinks when diffing aga
i
nst the work
t
ree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
di
f
ftool: Call the
t
e
m
p
directo
r
y "git-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
ilar
difftool: Move option values into a
h
as
h
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
difftool: Eliminat
e
global
v
ariables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguilar
d
iffto
o
l: Simplify print_tool_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
D
avid Aguilar
t7
8
00: Test difftool passin
g
argumen
t
s to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
D
a
v
i
d
Aguilar
me
r
ge
t
ool: P
r
o
vide an em
p
ty file when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David
Aguilar
Makefile: I
m
p
rove compil
e
r he
a
d
e
r depend
e
ncy check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergeto
o
ls/meld: Use
'
--out
p
ut' when available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agui
l
a
r
mergeto
o
l
-
-li
b
:
Refacto
r
t
ools i
n
to separate f
i
les
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguilar
merget
o
ol--li
b
: Make style
consist
e
nt with
git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avi
d
Ag
u
ilar
d
iff
t
ool--he
l
per: Make style consi
s
te
n
t
w
ith git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David A
g
uilar
t
/
t
7503-pre-co
m
mit-h
o
ok
.
sh: Add GIT_PR
E
FI
X
t
es
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid
Aguilar
git
-
merge
t
o
o
l--li
b
: Make vimdiff retain the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
uilar
git: Remove han
d
ling for GIT_PREFI
X
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setup: Prov
i
de
G
IT
_
PREF
I
X
t
o built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodule sync:
U
pdate "sub
m
odule
.
<nam
e
>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
Dav
i
d Ag
u
ilar
me
r
g
e
t
o
ol:
Skip autoresolve
d
paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David
A
guilar
Documentation: Expla
i
n git-mergeto
o
l
's use of temp
o
r
ary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Ag
u
ilar
Makefile: Remove usage
o
f deprec
a
ted Pytho
n
"h
a
s_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David
Agu
i
lar
difftool: Fix '--gui' when diff
.
gui
t
ool is unc
o
nfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
Davi
d
Aguilar
t7800-di
f
f
tool
.
s
h: Test mergeto
o
l
.
prompt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Agu
i
lar
di
f
ftool: Updat
e
copyright
notices to list ea
c
h
year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id
Aguil
a
r
difft
o
ol: U
s
e eval
t
o
e
xp
a
nd
'--extcm
d
'
express
i
ons
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
dif
f
to
o
l:
Ad
d
'-x' and
a
s
a
n alias for '--extc
m
d'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uilar
t
7
800-diffto
o
l
.
sh: S
i
mplify the --extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-diff
.
txt: Link t
o
git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
A
gu
i
la
r
diff
t
o
o
l: Allow specify
i
ng unconfi
g
ured com
m
and
s
w
i
th
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
d
ifftool--helper:
R
emove
use of t
h
e GIT_MER
G
E_TOO
L
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
i
fftool--help
e
r: Update cop
y
righ
t
and r
e
move distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-diffto
o
l:
A
d
d
'
--
g
ui'
for selecting a GUI too
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d Aguilar
t78
0
0-difftoo
l
: Set
a bogus t
o
o
l for use by test
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
D
a
v
i
d
A
g
u
i
lar
hel
p
:
Do not unneces
s
arily look for a reposi
t
ory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
Dav
i
d Aguilar
s
ubmod
u
le
.
c: S
q
uelch a "us
e
before assi
g
nment" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff: gener
a
te
p
retty file
n
ames
in pr
e
p
_
temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Aguilar
com
p
at:
ad
d
a basename
(
) compatibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
g
u
il
a
r
co
m
pat
:
a
dd a
m
ks
t
e
mps()
comp
a
tibil
i
t
y
func
t
ion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add git-replace to
.
g
itignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Agu
i
lar
mergeto
o
l--
l
ib
:
add
s
upport for araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
mergetool--l
i
b: specialize diff o
p
ti
o
n
s
f
or emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David
Aguilar
mergetool
-
-
l
ib: si
m
plify AP
I
u
sage by removing
more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d A
g
u
i
l
a
r
difftool
/
merg
e
tool:
r
efa
c
t
or
c
ommand
s
to use
git-me
r
ge
t
ool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
mergetool: us
e
$(
.
.
.
) i
n
stead
of `backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
bash complet
i
o
n: add g
i
t
-d
i
fftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
ool: add support f
o
r
a difftool
.
p
r
o
mp
t
config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguila
r
difftool: add various g
i
t-diff
t
ool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
i
lar
difftool: m
o
ve
'
git-
d
ifftool' out of con
t
rib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
difftool: add a
-y shortcut fo
r
--no-p
r
ompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftool:
use per
l
bui
l
t-ins w
h
en tes
t
ing for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
A
guilar
difftool: re
m
ove
the backup file featur
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Agu
i
l
a
r
difftool: remove merge options for
opendif
f
, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Agui
l
ar
e
v
er
y
day: use t
h
e dashless form of g
i
t-ini
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
Dav
i
d Aguilar
contrib/difftool
:
use
a
s
eparate conf
i
g namespace
f
or
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Ag
u
ilar
contrib/dif
f
tool: Don't repeat merge
tool candid
a
tes
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool: pu
t
the cur
s
or on th
e
editable
f
ile
for V
i
m
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
vid Ag
u
ila
r
difftool: fix doc
u
m
ent
a
tion
p
ro
b
lems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
c
o
ntrib
:
add '
g
it
difftool' for launching commo
n
merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
D
a
vid
A
g
u
ilar
git-
m
ergetool
:
properl
y
handle "git mergetool -- filena
m
e"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
t
e
sts: add a
testcase for "git submodu
l
e sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Aguila
r
git-su
b
module:
add "sy
n
c
"
c
o
m
m
a
nd
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
Da
v
id Aguilar
g
i
t-submod
u
le: replace duplicated
c
ode with a module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David
A
gu
i
lar
[
PATCH] gitk:
D
on't show l
o
cal changes
w
hen
w
e th
e
r
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree