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
t7800: update copyright notice
2013-02-20
David Aguil
a
r
t
7
8
00:
update
c
o
pyright notice
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
D
avid Aguilar
d
i
f
ftool: silence uni
n
i
tialized var
i
able warn
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
a
v
id Aguilar
p4merge: fix
p
rintf
u
sage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David
A
guilar
difftool--helper:
fix printf
usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Agui
l
ar
doc:
genera
t
e
a
l
i
st of val
i
d me
r
ge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Agu
i
lar
m
e
r
getool--l
i
b: ad
d
func
t
ions for
f
i
nding availab
l
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David A
g
uilar
mergetool--lib:
improv
e
the
h
e
lp text in
guess_merge_tool
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
a
v
id
A
guilar
mer
g
etoo
l
--lib: simplify
c
ommand exp
r
e
s
s
ions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mer
g
etools
:
simplify how we handle "vim" and
"
defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mer
g
etool--li
b
: improv
e
show_tool_
h
e
lp(
)
ou
t
put
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Davi
d
A
guilar
mer
g
etools/
v
im: rem
o
ve redundant diff
c
ommand
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
Dav
i
d Agui
l
ar
m
ergetools/
p
4m
e
rge:
Honor
$TM
P
DIR
f
or
the
/de
v
/
nu
l
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
merget
o
ols/p4merge: Handle "/dev/nu
l
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
merge
t
ool--lib:
All
o
w c
u
stom commands to override built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
g
itk: Rename '
t
a
g
c
o
ntents' to 'cached_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gi
t
k
: Te
a
c
h
"Reread ref
e
rences" to rel
o
ad tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
merge
t
ool,di
f
f
t
ool: Doc
u
m
ent -
-
tool-help co
n
sistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Aguil
a
r
d
if
f
tool: Di
s
a
ble --symlinks
on c
y
gwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Agu
i
lar
di
f
ftool:
H
andle comp
a
re() returning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Agui
l
ar
d
ifftool: W
r
ap long li
n
e
s
for readability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
D
a
v
i
d
A
gu
i
lar
diff
t
ool: Ch
e
ck all ret
u
rn co
d
es from comp
a
re()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: Ha
n
dle finding merget
o
ols/
i
n a path
w
i
t
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
difftool: Use symlin
k
s when diffing
a
gainst the worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Agu
i
lar
diff
t
ool: Call t
h
e
t
emp dir
e
c
t
or
y
"git-d
i
fftool
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
i
d
Aguilar
difftool:
Move o
p
t
ion va
l
ues into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
id Ag
u
i
lar
difftool:
Eliminate glo
b
al variabl
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
fftoo
l
: Simpl
i
f
y
print_tool_he
l
p
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Aguil
a
r
t7800
:
Test diffto
o
l passing arguments to
d
iff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David
Aguila
r
mergetool:
Pro
v
ide an emp
t
y file whe
n
n
e
eded
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
Dav
i
d
Aguilar
Makefile: Improve compiler
h
eader dependen
c
y check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
A
g
uil
a
r
mergeto
o
l
s
/
me
l
d: Use
'
-
-outpu
t
' when available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguil
a
r
mergetool--lib: Refacto
r
tools into
s
ep
a
rate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguilar
m
e
rgetoo
l
--li
b
: Make st
y
l
e
consistent with
g
it
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
Agu
i
lar
difftool--helper: Ma
k
e
s
tyle consistent
with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David
Aguilar
t/t7503-pre-commit-hook
.
sh:
A
dd GIT_PREFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d
A
g
uilar
git-merge
t
ool--lib:
Make
v
imdiff retain the
current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguila
r
git:
Remo
v
e handling for GIT_P
R
EFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id Aguilar
setup: Pr
o
vide GIT_PREFI
X
to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Davi
d
Ag
u
ilar
submod
u
le sync: Update "submodule
.
<na
m
e>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
D
av
i
d Aguilar
mergetool: Skip
a
u
tore
s
ol
v
ed paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David A
g
uilar
Docum
e
ntation: Explain gi
t
-m
e
r
getool'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
o
f deprecated
Python "has_ke
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
Da
v
id
Agu
i
lar
difftool: Fix '-
-
gui' when diff
.
guitool is
u
n
config
u
red
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Ag
u
ilar
t7800-d
i
fft
o
ol
.
sh
:
T
e
st mergetool
.
pr
o
m
pt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Agu
i
l
ar
diffto
o
l: Update co
p
y
r
ight notices t
o
l
ist each
year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
i
d A
g
uilar
difftool: Use eval
to
ex
p
and '--extcm
d
' exp
r
essio
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
A
guilar
diff
t
ool: Add '-x'
an
d
as
an
a
lias for '--
e
xtcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguila
r
t7800-di
f
ftool
.
sh: S
i
mplify the --
e
xtcmd
test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
v
id A
g
uilar
g
i
t
-diff
.
txt: Lin
k
to git
-
difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
ar
d
i
fftool: Allow specif
y
ing unconfigured commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Agui
l
a
r
d
i
f
f
tool--helper: Remove use of th
e
GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguilar
d
i
fftool-
-
helper: Up
d
ate copyright a
n
d remov
e
distractin
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
av
i
d Ag
u
ilar
git-difftool:
A
dd
'--gui'
for selecting a
GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id Agui
l
ar
t7800-diff
t
ool: Set a bogus tool for use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David
A
guilar
help: Do
not unne
c
essarily l
o
ok fo
r
a repo
s
itory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodu
l
e
.
c: Squelch a "use before assignme
n
t
" wa
r
ning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
uilar
diff: generate pretty
f
ilen
a
mes i
n
pre
p
_temp_bl
o
b(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add a basename() compatibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guila
r
compat: add
a
m
kst
e
mp
s
() compatib
i
l
it
y
function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
i
l
a
r
A
d
d git-replace to
.
g
i
tignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David
A
guilar
mergetool--lib: add support
f
or ar
a
x
is merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
Da
v
id A
g
uila
r
merget
o
ol--lib: s
p
ecialize diff
o
ptions for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
avid Agu
i
l
ar
me
r
getool--
l
ib: simp
l
ify API us
a
ge by
r
e
m
o
v
ing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
difftoo
l
/
m
ergeto
o
l
:
refac
t
o
r com
m
a
n
ds to use gi
t
-me
r
getool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
ui
l
ar
merge
t
ool: us
e
$(
.
.
.
) inst
e
ad of `backt
i
cks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash com
p
l
etion: ad
d
git-difft
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
ool: add support for
a
d
i
fftool
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
guilar
diff
t
ool:
add v
a
rious git-difftool te
s
ts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id
A
guilar
difftool: move 'git-diffto
o
l' out of co
n
trib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
difft
o
ol: add
a -y shortcut for
--no-pr
o
mpt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
Aguilar
difftool
:
use perl built-ins when testing
f
or msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid
A
guilar
difftool: remove
t
h
e
backup fi
l
e featu
r
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uila
r
difftool: remove merg
e
options for
o
p
e
ndi
f
f, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
ev
e
r
y
d
ay:
us
e
th
e
da
s
hless form of g
i
t
-
init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David
A
g
ui
l
ar
contr
i
b/difftool: use a sepa
r
ate config namespace f
o
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David A
g
ui
l
ar
contrib/difftool:
D
on
'
t rep
e
at
mer
g
e tool candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
avid Aguilar
d
i
fftool: put the
cursor
o
n the editable file for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Ag
u
ilar
difftoo
l
: fix docu
m
entation problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David
Aguilar
co
n
tri
b
:
a
dd 'git d
i
fftool
'
f
or launching common m
e
rg
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
D
a
vid Aguil
a
r
git-merg
e
t
ool
:
pr
o
p
erly handle "git mergetool -- fi
l
ename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguil
a
r
t
est
s
: add
a testcase for "git submo
d
ule s
y
nc"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git-submodu
l
e: add "sync" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David
A
gui
l
ar
git-sub
m
odule:
rep
l
a
ce
d
u
p
licated co
d
e
w
ith a module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[
P
A
TCH]
gitk: D
o
n't show
local
changes when w
e
th
e
re
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree