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: silence uninitialized variable warning
2013-02-17
David
Agu
i
lar
diff
t
ool: silenc
e
uni
n
itialized variable warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Agui
l
ar
p4merge: fix printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
avi
d
Aguil
a
r
diffto
o
l
--helper:
f
ix p
r
intf
usag
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David A
g
uilar
doc: gen
e
rate a li
s
t
o
f vali
d
merge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
m
erg
e
tool--li
b
: add functions
f
or finding
a
vai
l
able
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Aguilar
mergetool-
-
lib: i
m
pro
v
e the help text i
n
g
ues
s
_
m
e
rge_t
o
ol
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d
Aguilar
mergetool
-
-lib: simplify command expre
s
sions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
Aguilar
me
r
getools
:
simpli
f
y how
we
h
andle "vim" and
"
defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Agu
i
lar
me
r
getool-
-
lib: improve
show_t
o
ol_
h
el
p
(
)
outpu
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David
A
gui
l
a
r
m
e
r
getools/vim: remove r
e
d
u
ndant dif
f
c
o
m
mand
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David Ag
u
ilar
merget
o
ols/p4me
r
ge: Honor $TMPDIR for the /dev/
n
ull
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David
Aguilar
mergeto
o
ls/p4merge
:
Handle "/dev/null
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
Dav
i
d Agui
l
a
r
merget
o
ol--lib: Allow custom comma
n
ds to
override buil
t
-i
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
avid Agu
i
lar
gitk: Rename '
t
agcontent
s
' to 'cached_tagco
n
tent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Teach
"
Re
r
ead references" to rel
o
ad tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
D
a
vid
Aguilar
me
r
g
e
to
o
l,diffto
o
l:
D
ocu
m
ent --tool-he
l
p co
n
si
s
tently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
uilar
d
i
fftool: Disable --
s
ymlinks on cyg
w
in
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Handle comp
a
re() retu
r
ning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Aguila
r
di
f
ftool:
W
rap
l
ong lines fo
r
readabil
i
ty
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
d
ifftool: Chec
k
all return cod
e
s from c
o
mp
a
re()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: Handle
f
inding merget
o
ols/ in a path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
dif
f
t
ool
:
Use symlinks when diffing
aga
i
nst the worktre
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
ar
difft
o
ol: Call the
t
emp d
i
r
e
ctor
y
"git-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
i
d
Aguilar
difft
o
ol: Move option value
s
into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguil
a
r
difftool: E
l
iminat
e
g
l
obal variab
l
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diff
t
ool: S
i
mplify pri
n
t_tool_help
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Agu
i
lar
t7
8
00: Test difftool
p
assi
n
g
arguments t
o
d
i
ff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
m
e
rge
t
ool: Provide
an empty file when
n
eeded
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
Da
v
id Aguilar
M
akefile: Improv
e
compi
l
er header
d
ependency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Ag
u
ilar
merge
t
oo
l
s
/meld: Use '
-
-output' when available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d
Aguilar
mergetool
-
-lib:
Refactor tools i
n
to sep
a
rate file
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Agu
i
l
ar
mer
g
etool-
-
lib: Make s
t
yle consistent with g
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
difftool--
h
elper: Make s
t
y
le
consist
e
nt with
git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
Davi
d
Agui
l
a
r
t/t7
5
03-pr
e
-
c
ommi
t
-hook
.
sh:
A
dd
GIT_PREFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
g
it-mergetool--lib: Make vimdiff retain
t
he current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David
A
guilar
git:
R
emove handli
n
g for GIT_PREFI
X
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
uilar
setup
:
Prov
i
de GIT_PREFIX to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
s
u
bm
o
dule s
y
nc: Update "submo
d
ule
.
<
name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
mer
g
etool: Skip a
u
toresolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
D
avid Aguil
a
r
Docu
m
ent
a
tion: E
x
plain git-mergetool's use of tempor
a
r
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefile: Remove usage of d
e
precated Pyt
h
on
"
ha
s
_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
D
a
vi
d
Aguilar
d
ifftool:
F
ix
'--gui' when
d
iff
.
guitool is u
n
configured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguila
r
t7
8
00-difftool
.
sh: Tes
t
me
r
getool
.
pr
o
mpt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
Dav
i
d Ag
u
i
l
ar
difftool: Upd
a
t
e
c
opyright notices
to list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agu
i
lar
difft
o
ol: Use eval to expand '-
-
extcmd' expressio
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agu
i
l
a
r
difftool: Add '-x' and a
s
an alias f
o
r '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7800-di
f
ftoo
l
.
sh: Simplify the --extcmd t
e
st
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
gi
t
-dif
f
.
txt: Link to
g
it-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guila
r
diffto
o
l:
A
llow
specifying unco
n
f
i
gured
c
o
mma
n
ds with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
ifftool--helper: Re
m
ove use of the GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id A
g
uila
r
difftool--helpe
r
: Upd
a
te copyrigh
t
and
r
emove distrac
t
ing
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git
-
d
i
f
f
tool: Add '--gui' for selecti
n
g a GUI
to
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David
A
g
uilar
t7
8
0
0
-difftool
:
Set
a
b
ogus tool fo
r
use by t
e
sts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Da
v
id Ag
u
ilar
help: Do
n
ot
unnec
e
ssaril
y
l
ook for a reposito
r
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
D
a
vi
d
Agu
i
lar
submod
u
l
e
.
c: Squelch a "use b
e
fore assignment" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
d
i
ff:
generate pretty filenam
e
s in
p
rep_temp_
b
lob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
i
l
ar
c
o
mpat:
ad
d
a basename() c
o
m
pa
t
ibil
i
t
y function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguilar
compat: a
d
d a mkstemps() comp
a
tibil
i
ty fun
c
tion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agui
l
ar
Add git-replace t
o
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
merg
e
t
ool-
-
lib: add supp
o
rt for
araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
D
a
vid Aguilar
mer
g
et
o
ol--lib: specialize diff options for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mer
g
etool--lib: s
i
mplify API usage by
rem
o
ving more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avi
d
Aguilar
dif
f
tool
/
mer
g
e
tool: refactor com
m
ands
to use gi
t
-merget
o
ol
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
A
guilar
merg
e
tool: use $(
.
.
.
)
in
s
te
a
d of
`
backti
c
ks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
ba
s
h compl
e
tion: ad
d
git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
av
i
d
A
guilar
diffto
o
l:
add support for a difftool
.
p
rompt
conf
i
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftool: add
v
ar
i
ous git-difftool t
e
sts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
i
lar
d
i
f
f
to
o
l: move 'git-d
i
f
ftoo
l
' o
u
t of
c
o
ntrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguil
a
r
di
f
ftool: add a -y shortcut for --
n
o-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftool:
u
se pe
r
l
built-in
s
when testi
n
g for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftool: re
m
ove the
backup
f
i
l
e
f
e
a
t
ure
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Ag
u
ilar
di
f
f
t
o
ol: remove merge o
p
tion
s
for opendiff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Agu
i
lar
ever
y
day: use the dashless form of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David
A
guilar
contrib/diff
t
o
o
l
:
use a separate config namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
D
a
v
i
d
Aguil
a
r
contrib/diff
t
ool: Don'
t
repeat
m
e
rge tool cand
i
dates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool: put
th
e
cursor on the
e
ditabl
e
f
i
l
e
f
or Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
avid
A
g
uilar
d
i
fftool: fix do
c
umen
t
atio
n
problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
Davi
d
Agu
i
la
r
cont
r
ib: add 'git difftool
'
for launching common
m
e
r
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
g
i
t-mergetool: proper
l
y
h
a
n
d
l
e
"git mergetool -- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
D
a
v
i
d Aguilar
tests: add a t
e
stcase fo
r
"gi
t
submodule
sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
D
avid Aguil
a
r
git-submodule:
ad
d
"
s
ync" comman
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
Dav
i
d
A
guilar
git-subm
o
dule: replace
duplicated code with a module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
D
av
i
d A
g
ui
l
ar
[
P
ATCH] git
k
: Don't
s
how
l
o
cal change
s
when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree