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
difftool: Allow specifying unconfigured commands with --extcmd
2010-01-10
Dav
i
d Agu
i
lar
difftool: All
o
w specifyi
n
g unc
o
nfigured
commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guila
r
d
ifftool
-
-helper:
Remove use
o
f the
G
IT_MERGE_TOO
L
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
av
i
d
A
guilar
diff
t
o
o
l
-
-hel
p
er:
Update
copyrigh
t
a
n
d remo
v
e dis
t
r
acting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-di
f
fto
o
l:
Add '--
g
u
i' for
s
electing a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
avid A
g
u
ila
r
t7800-difftool: Set
a
b
o
gus tool for use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Dav
i
d
A
gui
l
ar
help: Do not u
n
neces
s
arily l
o
ok for a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodule
.
c: Squelch a "use
b
efore assignment" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
g
u
ilar
diff
:
g
e
n
erate
pre
t
ty filenames in
p
rep_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add a
basenam
e
() comp
a
tibility func
t
ion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
l
ar
compat: add
a mk
s
temps
(
) com
p
atibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add
g
it-replace
t
o
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Agu
i
lar
mergetool--lib:
add s
u
pport f
o
r
araxis
merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Ag
u
ilar
merge
t
ool--lib: specialize diff options for e
m
e
r
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguil
a
r
merg
e
tool--lib: si
m
plify API usage
by
re
m
o
v
i
ng m
o
re
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Ag
u
ilar
difftool/mergetool: re
f
actor
c
ommand
s
to use git-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
mer
g
etool:
u
se $(
.
.
.
) instead o
f
`bac
k
ticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avi
d
Aguilar
bash completion:
add git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
d
i
fftool:
a
dd
s
up
p
ort f
o
r a difftoo
l
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
difftool: add var
i
ous git-difftool
t
e
sts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id
Aguilar
d
i
f
f
t
ool: mov
e
'git-difftool'
o
ut of con
t
rib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguila
r
diff
t
ool:
add a -y s
h
ortcut for --
n
o-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
difft
o
ol: use perl bu
i
lt-in
s
wh
e
n tes
t
ing for m
s
ys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
dif
f
to
o
l:
remove the backup file feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool
:
remove merge options for o
p
e
ndiff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
ev
e
ryday:
u
se the dashless for
m
of git-in
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
c
ontrib
/
difftool: use
a separate conf
i
g
nam
e
spac
e
for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
Dav
i
d Aguilar
contrib/difftool: Don't repeat merge
tool c
a
ndid
a
te
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Agu
i
lar
difftool: put
t
he 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
difftool: fix d
o
c
ument
a
ti
o
n problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
contrib: ad
d
'git d
i
f
ftool' for launching common m
e
rge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David A
g
uilar
g
i
t-m
e
rgetool
:
properly h
a
nd
l
e
"
git merge
t
o
o
l -- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Ag
u
ilar
tests: add
a t
e
stcase f
o
r "g
i
t
submodule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
Dav
i
d Aguilar
git-sub
m
o
dule:
add "sync"
com
m
and
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Agu
i
lar
git-
s
ubmo
d
ule: repla
c
e duplicated code with a m
o
dule_
l
ist
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Ag
u
ilar
[PATC
H
] gitk: Don't show local chan
g
es
w
hen we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree