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: Check all return codes from compare()
2012-07-25
David Agui
l
ar
difftool:
C
h
eck all
r
eturn codes from compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Agu
i
lar
difftool: Handle fin
d
ing m
e
rgetools/ in a path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
i
d Aguilar
difftool: Use
symlink
s
when diff
i
ng ag
a
inst the worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
difftool
:
Call the
t
emp d
i
rec
t
ory
"
git-
d
ifftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Ag
u
ila
r
di
f
ftool: Move option values into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
di
f
ftool: Eliminate global variables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
difftool
:
Simplify print_tool_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Agu
i
l
a
r
t
7
800: Tes
t
dif
f
tool pa
s
sing arguments t
o
d
i
ff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David A
g
u
i
lar
merge
t
ool: Provide an empty f
i
le
when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguila
r
M
a
kefile: Imp
r
ove compiler header
d
ependency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merg
e
tools/meld: Use
'--outp
u
t' w
h
en available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
A
g
uilar
m
ergetool--
l
ib:
R
efact
o
r too
l
s into separate
fi
l
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mer
g
etool--lib:
M
a
k
e style consiste
n
t with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agui
l
a
r
difftool--help
e
r
:
M
a
ke style c
o
n
sistent
w
ith git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
D
avid
A
g
u
ilar
t/t7503-pre-commit
-
h
ook
.
sh: Add
G
IT_PREFIX tes
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David
A
guilar
git-merget
o
ol--lib
:
Make
vim
d
iff reta
i
n the cur
r
ent
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: Remove h
a
nd
l
in
g
f
o
r
G
IT_PREF
I
X
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setup: P
r
ovid
e
G
IT_
P
REFIX to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Davi
d
Aguilar
submodule sync: Updat
e
"su
b
mod
u
le
.
<
name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David
A
guila
r
mergetoo
l
: Skip autoresolved
p
aths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
D
avid A
g
u
i
lar
Documenta
t
ion: Expla
i
n git-mergetool's
use of temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
M
akefil
e
: Remove usag
e
of deprecated
Pytho
n
"
h
as_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David A
g
uil
a
r
di
f
ftool:
F
i
x '--gui' when
dif
f
.
guito
o
l is
unconfigure
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800-difftool
.
sh: Test mergetool
.
promp
t
f
allback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Agui
l
ar
d
iff
t
o
o
l: Update copyright no
t
ices
to
l
ist each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguilar
diffto
o
l: Use
e
val to expand '-
-
e
x
tcmd' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
diff
t
o
ol: Add '-
x
' and
as an al
i
as
for '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7800-difft
o
ol
.
sh:
Simpl
i
fy the --extcmd te
s
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
v
i
d Aguilar
git-diff
.
txt: Link to
g
i
t-
d
if
f
t
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
l
a
r
difftool: Allow specifying
u
nconfigured commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
difftool--helper:
Remove use o
f
the GIT_ME
R
GE
_
TO
O
L
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
uilar
dif
f
tool--he
l
p
er: U
p
date copyright and remove distractin
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-difftool: Add
'
-
-gui' for
select
i
ng a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Davi
d
Aguilar
t7
8
00-dif
f
tool: Se
t
a
bogus tool
for u
s
e by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
he
l
p: D
o
not unnecessaril
y
look for a reposit
o
ry
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodule
.
c: Squ
e
lch a
"use befo
r
e as
s
ignment" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff:
g
e
nerate
p
ret
t
y filenames
in prep
_
t
e
m
p_blob
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
ui
l
a
r
c
ompat: ad
d
a basename(
)
compati
b
i
l
ity function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguil
a
r
compat: add a
m
kstemps()
c
ompati
b
ility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Aguilar
Add g
i
t-r
e
place to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David
Agu
i
lar
mergeto
o
l
-
-
l
i
b:
add support for araxis merg
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
D
av
i
d Agui
l
ar
mergetool--lib: special
i
ze diff
options
f
or emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
Davi
d
Aguil
a
r
merg
e
tool--lib
:
simpl
i
fy API usa
g
e by removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
fft
o
o
l/merge
t
ool:
r
e
fac
t
or command
s
to
u
s
e
git-mer
g
etool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
mergeto
o
l: u
s
e $(
.
.
.
) ins
t
ead
of `backticks
`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash c
o
mpletion
:
ad
d
g
it-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agu
i
l
a
r
d
ifftool: add
suppo
r
t for a d
i
f
f
tool
.
p
romp
t
co
n
fig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftool: add various git-di
f
ftool te
s
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
ifftool: move 'git-diffto
o
l' out of contri
b
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
diff
t
ool: 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
Agu
i
l
a
r
difftool:
u
s
e
perl b
u
ilt-ins when
testing for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool
:
remove the b
a
ckup
file fe
a
ture
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
f
fto
o
l:
remove
merge op
t
ions
f
o
r op
e
n
diff,
tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
ev
e
ryday:
u
se
the das
h
les
s
form o
f
git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
con
t
rib/diffto
o
l: use a separate con
f
ig namespace f
o
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Agu
i
lar
c
o
n
trib/
d
ifftool:
Don'
t
repeat mer
g
e tool ca
n
didates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David A
g
uilar
dif
f
tool: put the curso
r
on the editable
file for
V
im
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
d
i
f
ftool:
f
i
x documenta
t
ion problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
contrib: add 'git difftool' for launch
i
ng
c
ommo
n
merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Agui
l
ar
g
i
t
-merg
e
tool
:
p
r
operly handle
"git
mergetool -- filenam
e
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Agu
i
la
r
te
s
ts: ad
d
a
t
estcase for "git submo
d
ule
sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
D
a
v
i
d Aguil
a
r
git-submodu
l
e
:
add
"sync" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
Dav
i
d Aguilar
git-submodule:
r
eplace duplicat
e
d code with a module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Ag
u
ilar
[PAT
C
H
]
gi
t
k:
D
on't show loc
a
l changes
when
w
e there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree