repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t7800-difftool: Set a bogus tool for use by tests
2010-01-03
David Aguilar
t
7
800-difftool: Set a bog
u
s tool
f
or use
by
tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
hel
p
: Do not unnecessari
l
y look fo
r
a
repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submod
u
le
.
c: Sque
l
ch a
"
use bef
o
r
e assi
g
n
m
ent" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
uilar
diff:
gener
a
te pretty filenam
e
s in prep_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguilar
compat: add a
b
asen
a
me() compatibility func
t
ion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
ilar
compat:
add a mkst
e
m
p
s
(
) compa
t
ibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
ui
l
ar
Add git-
r
e
p
lace to
.
gitig
n
ore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Agui
l
ar
me
r
g
e
tool--li
b
: add supp
o
rt for araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
mergetool--lib: specialize diff opt
i
ons for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David
A
guilar
mergetool-
-
lib: si
m
p
l
ify API usage by removing mo
r
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
uilar
d
i
fftoo
l
/
mergetool: refactor c
o
mmands to
use git-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
merget
o
ol:
use $(
.
.
.
)
instead of
`
backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Agui
l
ar
b
ash
c
ompletion: add
git-difftoo
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
A
g
uilar
difftool:
add support for
a
difftoo
l
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
d
iff
t
ool: add various git-difftool test
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
dif
f
to
o
l:
mov
e
'git-d
i
fftool' out of cont
r
i
b
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid A
g
u
i
lar
difftool: add
a
-y
s
hortcu
t
fo
r
--
n
o
-prom
p
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vi
d
Aguilar
d
ifftool: us
e
p
e
rl
built-ins when
t
esting for ms
y
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difft
o
ol
:
remove the backup
file fe
a
ture
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
difftool: r
e
m
o
ve merge
opti
o
ns for opendif
f
, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
D
avid Aguilar
everyday: use the dashless form of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
D
av
i
d
A
g
uila
r
contrib/d
i
fftool: use
a
s
e
p
a
rate conf
i
g names
p
ace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David
A
guilar
contrib/difftool:
Don'
t
repeat
merge
t
ool candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
av
i
d Aguilar
difftool: put the cursor on the ed
i
table fil
e
for
Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David
Aguilar
difftool:
fix documentat
i
on problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Agu
i
lar
contrib: add 'git difftool'
for
l
aunchin
g
c
o
mmon merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Agu
i
lar
git
-
me
r
ge
t
o
o
l
: pro
p
erly
h
andle "git
m
ergetool --
filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
Dav
i
d Aguila
r
tests: add a
testcase for "
g
it s
u
b
modu
l
e syn
c
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
Da
v
id Aguilar
git-submodule: add "sync"
co
m
mand
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
Da
v
id Aguilar
git-submodule: re
p
lace d
u
plicated c
o
d
e w
i
th a module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PATCH]
gitk
:
Don't s
h
ow local changes when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree