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: fix bug when printing usage
2012-07-23
David Aguilar
difft
o
ol: Us
e
s
y
mlinks wh
e
n diff
i
ng against the wo
r
ktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
difftool: Call the
t
em
p
directory "git-difft
o
ol"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguilar
dif
f
tool: Move opti
o
n
v
a
lues into a h
a
sh
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diffto
o
l
: El
i
mina
t
e
g
lobal v
a
riables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
difftool: Simplify p
r
int
_
t
ool_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t
780
0
:
Test diffto
o
l passing ar
g
ume
n
ts to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
D
avid Ag
u
il
a
r
mergetool:
P
rov
i
de an
e
mpty f
i
le whe
n
needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makefile: Im
p
rove compiler header depend
e
ncy
check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Ag
u
ilar
mergetools/meld:
U
s
e '--output'
w
he
n
avai
l
abl
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id
Aguilar
me
r
ge
t
o
ol--li
b
: Ref
a
ctor tools into separate f
i
le
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
me
r
getool--lib: Make style consiste
n
t with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
difftool--
h
elper: Make style consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t7503-pre-commit-
h
ook
.
sh:
Add
G
IT
_
P
R
E
FIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David
A
g
uil
a
r
git-mergetool-
-
lib: Make vimdiff reta
i
n t
h
e current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Aguilar
git: Remo
v
e handling for
G
IT
_
PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setup
:
Pr
o
vid
e
GI
T
_P
R
EF
I
X to
b
u
ilt-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguil
a
r
sub
m
odule sync: Update "sub
m
odul
e
.
<na
m
e
>
.
u
rl"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
Da
v
i
d Aguila
r
me
r
getool: Skip
a
utoresolved p
a
ths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Agu
i
lar
D
o
cumentati
o
n:
E
xpl
a
i
n git-mergetool's use of tempor
a
ry
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
M
akefile: Remove usag
e
of
deprecated Pyth
o
n "ha
s
_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
Da
v
i
d Aguila
r
difftool: Fix '-
-
gui'
when diff
.
guitool
is
un
c
o
n
figured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David
A
gu
i
lar
t7800-diff
t
oo
l
.
sh: Test merg
e
tool
.
p
ro
m
pt
fall
b
ack
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
a
vid Aguilar
difftool
:
Update co
p
yright no
t
ices to
l
i
s
t
each
year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
ilar
difftool: Use ev
a
l to exp
a
nd
'
-
-extcmd' expre
s
sion
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
i
fftool: Add '-x' and as an alias for
'--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguil
a
r
t7800
-
diffto
o
l
.
sh:
S
implify the
--ext
c
md test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguilar
git-diff
.
txt:
Li
n
k to git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguila
r
difft
o
ol:
A
llow
s
pecifying uncon
f
igured command
s
with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--helper: Remov
e
use of the GIT_
M
ERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Aguilar
di
f
ft
o
ol--helper:
U
pdate c
o
pyrigh
t
an
d
remove distr
a
cting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid A
g
uilar
git-difftool: Add '--gui' for select
i
ng a G
U
I tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David A
g
uilar
t7800-difft
o
o
l:
Set
a bogus t
o
ol
for u
s
e by t
e
sts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Dav
i
d Aguilar
help: Do not unnecessarily look for a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
Dav
i
d Aguil
a
r
sub
m
odule
.
c
:
S
quelch
a
"us
e
b
efore assignment" w
a
rning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vi
d
Aguilar
di
f
f
: generate pr
e
tty filenames i
n
prep_t
e
m
p
_
b
lob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compa
t
: add a basename() c
o
mpa
t
ibilit
y
function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat
:
ad
d
a mkstem
p
s(
)
comp
a
tibilit
y
function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add git-replace to
.
g
i
tignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
D
avid A
g
uilar
merget
o
ol--lib:
add su
p
p
ort for
a
r
a
xis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
D
a
v
id Aguilar
mergetool--lib:
s
peciali
z
e d
i
ff optio
n
s
fo
r
emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
avi
d
A
guila
r
merg
e
t
ool-
-
lib: simplif
y
API us
a
ge by remo
v
ing
mo
r
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
diffto
o
l/mergetool:
r
efacto
r
c
o
mmands
t
o use git-mergeto
o
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
m
e
rgetool: u
s
e $(
.
.
.
) ins
t
ead of `ba
c
k
t
ic
k
s`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
bash comple
t
i
on:
a
dd git
-
difft
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
difftool: add support for a difftool
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
difftool: add va
r
ious git-difftoo
l
tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agui
l
a
r
diff
t
ool: mov
e
'git-diff
t
ool' out
o
f
contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
la
r
d
i
ffto
o
l: add a -y shortcut for --no-pr
o
mpt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
difft
o
o
l
:
u
se p
e
rl built
-
i
n
s
when tes
t
ing
for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid A
g
uila
r
di
f
ftool: remove the backup file featur
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
d
iff
t
ool: remov
e
merg
e
opti
o
n
s
for opendif
f
, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Agu
i
lar
e
ve
r
yday:
use
the d
a
s
h
less form of git
-
init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
D
avid Aguilar
contrib/difftool: use a sep
a
r
ate co
n
fi
g
n
a
m
espa
c
e for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Ag
u
ilar
contrib/difftool:
Don't
r
epeat mer
g
e too
l
candid
a
tes
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David
A
g
uilar
diff
t
ool: put the cursor
on the editable file for
V
im
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguil
a
r
d
ifft
o
ol: fix docume
n
tation pro
b
lem
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
D
a
v
i
d Aguilar
co
n
t
r
ib:
ad
d
'git
d
ifft
o
ol' for
launching comm
o
n mer
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David
Aguilar
git-
m
ergetool: prop
e
rly han
d
le "
g
it merg
e
tool -- filename
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
D
avid Aguilar
te
s
ts: add a testcase fo
r
"gi
t
submo
d
ule sync
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git-submodule: add "
s
y
n
c"
command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David
Aguilar
git-submodule: rep
l
ace duplicated code w
i
th a modu
l
e_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
Davi
d
Ag
u
ilar
[
P
ATC
H
] gitk: Don't show local changes when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree