repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
mergetool--lib: specialize diff options for emerge and ecmerge
2009-05-09
David Aguilar
mergeto
o
l--
l
ib: speci
a
l
ize diff opti
o
ns f
o
r emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
Davi
d
Aguil
a
r
mergetool--lib: simplify API
u
sage by removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool/mergetool: refactor commands to use gi
t
-
m
e
r
getool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id
A
gui
l
a
r
mergetool: use $(
.
.
.
)
i
n
stead o
f
`bac
k
tic
k
s`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid A
g
uilar
bash completi
o
n: ad
d
git-dif
f
t
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
difftool: a
d
d
support for a difftool
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
i
d
Aguilar
diffto
o
l: add vari
o
us
git-
d
iff
t
ool test
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguil
a
r
difft
o
ol: move 'gi
t
-difftool'
o
ut of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
d
ifftool: a
d
d a -y short
c
ut for
-
-no-pr
o
mpt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
A
g
uil
a
r
d
i
f
ftool: use perl b
u
i
lt-ins
w
hen testing for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
difftool
:
r
e
move
t
he ba
c
ku
p
fil
e
f
eature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ila
r
d
ifftool: re
m
o
ve me
r
ge opti
o
ns for opend
i
ff, tkdi
f
f
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
Davi
d
Aguil
a
r
everyday: u
s
e
the dashless for
m
of
g
i
t-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
D
a
vid Aguilar
c
ontrib/difftoo
l
:
use
a
separate config
namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David
A
g
u
i
l
a
r
contrib/difftool: Don't repeat merge too
l
can
d
idates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Dav
i
d Agui
l
ar
d
ifftool: put the
cur
s
or on the e
d
itab
l
e file for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David A
g
uilar
difftool: fix documentation problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Ag
u
ilar
contrib: ad
d
'
g
it dif
f
tool
'
for launchi
n
g common m
e
rge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetool: properly handle "git
m
e
r
getool
-- filename
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David
A
g
u
i
lar
tests: add a testcase for "git submodul
e
syn
c
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git
-
submodule: a
d
d "sync" co
m
mand
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
Dav
i
d Aguilar
gi
t
-sub
m
o
dule: replace dupli
c
ated
cod
e
with a
m
o
d
u
le_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
D
a
vid Ag
u
i
l
ar
[PATCH] gitk: Don't sh
o
w
l
ocal changes when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree