repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-diff.txt: Link to git-difftool
2010-01-10
Da
v
id
A
guil
a
r
git-
d
iff
.
t
x
t: Link to git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool: All
o
w specifying
u
nconfigured commands
w
it
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
ilar
difftool--helper: Remove use of the GIT_MER
G
E
_
T
O
OL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
difftool
-
-helpe
r
:
U
p
d
ate copyright and
r
emove
distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David
A
guilar
g
it-difftool:
Add
'
--gui' for selecting a GUI
t
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguila
r
t780
0
-difftoo
l
:
Set a b
o
g
u
s
tool for use b
y
t
es
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Agu
i
lar
he
l
p: Do not unnecessa
r
ily look for a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
Davi
d
Aguilar
submodul
e
.
c: Squel
c
h a "u
s
e before a
s
s
i
gnment" warnin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
dif
f
:
ge
n
erate
p
r
etty filenames in prep_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agui
l
ar
co
m
pa
t
: add a basen
a
me() compatibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Ag
u
ilar
c
o
mpat: add a mkstemps()
compatibilit
y
fun
c
tio
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
Ad
d
git-repla
c
e to
.
gitigno
r
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
Davi
d
Agui
l
ar
mergeto
o
l--lib: add supp
o
r
t for araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Aguila
r
m
e
rgetoo
l
--l
i
b: speciali
z
e
diff options for
e
mer
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
Davi
d
A
g
uilar
mergetool--lib: simplify API usa
g
e by
r
e
m
oving more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
A
guilar
d
ifftool/
m
ergetool: refac
t
or com
m
a
nds to us
e
g
it-
m
er
g
etool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid
A
guilar
m
ergetool: us
e
$(
.
.
.
)
i
ns
t
e
ad of `backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
b
ash compl
e
tion: add git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
guil
a
r
d
ifftool: add suppor
t
for a dif
f
too
l
.
promp
t
config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difft
o
o
l
: add var
i
o
us git-diff
t
ool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
g
u
ila
r
d
i
ffto
o
l: move 'git-difftool' out of
c
ontrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
difftool:
a
dd a -y shortcut for
-
-
n
o
-
p
rompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool:
u
se perl bui
l
t-ins wh
e
n
testing for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
difftool: remov
e
the backup
f
ile
feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
d
i
f
ftool:
r
emove merge options for opendiff,
t
kd
i
ff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
D
a
vid Ag
u
ilar
everyd
a
y
: use
the dashless form of
g
i
t-i
n
it
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
Dav
i
d
A
gui
l
ar
c
o
ntri
b
/diff
t
ool: use
a separate config namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David
Agu
i
lar
cont
r
i
b
/d
i
f
ftool: Don't repeat merg
e
tool candida
t
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Agu
i
lar
diff
t
ool: put the cu
r
sor
on
t
he edita
b
le file for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftoo
l
: fix
d
o
cumentation problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David
A
guilar
c
o
n
t
r
i
b: add 'git
d
ifft
o
ol
'
for la
u
nching
comm
o
n merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Agu
i
lar
git-merg
e
tool: prop
e
rly han
d
le
"git mergetool --
f
il
e
name"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
Davi
d
Aguilar
tests: ad
d
a testcase
for "git
submodule
s
ync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David
A
guilar
git-submodule
:
add "syn
c
" comm
a
nd
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-submodule: replace duplica
t
ed code with a modu
l
e_lis
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PATCH] git
k
: Don't show loc
a
l
c
h
a
nges w
h
e
n
we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree