repo.or.cz
/
git
/
dscho.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
David A
g
ui
l
ar
g
it-
d
iff
.
tx
t
: Li
n
k to git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool: A
l
low spec
i
fying unconfi
g
ured commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
difftool
-
-helper: Remove use of the GIT_MERGE_
T
OOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool
-
-
helper: Update
copyright and re
m
ove
d
is
t
r
acting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid Aguil
a
r
git-difftool: Add
'--gui' for selec
t
ing a G
U
I
tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguila
r
t7800-difftool: Set a bogus tool
f
or
use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
he
l
p: Do not u
n
necessarily l
o
ok
for a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Ag
u
i
lar
s
u
bmodule
.
c: Squelch a "us
e
b
e
fore assig
n
ment" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
dif
f
:
generate
p
re
t
ty
f
ilena
m
es in prep_te
m
p_
b
lob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
ilar
c
o
m
pat:
add a basename()
c
om
p
atibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Agui
l
ar
com
p
at: add a mkstemps()
c
ompatibility funct
i
on
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
Add
g
i
t-
r
ep
l
ace to
.
git
i
gnore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
D
a
v
i
d Aguilar
mergetool
-
-lib
:
add support for araxis me
r
ge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
Davi
d
Aguila
r
mergetool--lib:
s
pecialize dif
f
options for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
a
v
id Aguilar
mergetool--lib:
sim
p
lify API us
a
ge by remov
i
ng
m
ore
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftool/
m
ergetool: ref
a
c
tor commands to use git
-
merge
t
ool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d
Aguilar
merg
e
tool: us
e
$(
.
.
.
) instead of `backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
bash co
m
pletion: add g
i
t-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftool: add
support for a difftool
.
p
r
omp
t
conf
i
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguila
r
difft
o
ol: add va
r
iou
s
git-
d
ifft
o
o
l
tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
difft
o
o
l: move
'
git-diffto
o
l' out
of co
n
trib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguila
r
difftool: add a -y shortcut for --no-
p
rompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id Ag
u
ilar
difftool: use perl built-ins
when
t
esting for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
ifftool:
r
emove the backup fil
e
fe
a
ture
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
difftool: remove merg
e
options for o
p
en
d
iff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
D
a
v
id
A
guilar
everyday: u
s
e the
dashless form of git-in
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
D
avid
Ag
u
ilar
contri
b
/diff
t
o
ol: use a s
e
p
arate c
o
nf
i
g namesp
a
ce for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
c
o
ntrib/d
i
fftool: Don't r
e
pea
t
merge tool candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
avid Aguila
r
diffto
o
l: put the cur
s
or on the
e
ditable file for
V
im
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
di
f
ftool:
f
ix
d
ocumenta
t
ion p
r
ob
l
ems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguil
a
r
contrib: add 'git
d
iff
t
ool' for launching common merg
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
D
a
vid Ag
u
ilar
gi
t
-
mergetool: prope
r
l
y handle "git
m
ergetool --
f
i
l
ename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests: add a testcase
for
"git subm
o
dule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git-submodule: add "sync
"
command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-submodule: r
e
p
l
ace d
u
plic
a
t
ed code with
a module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PA
T
CH] gitk: Don't
show l
o
cal changes when w
e
there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree