repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add a very basic test script for git mergetool
2008-03-05
C
h
arl
e
s
B
a
iley
Add a very basic test scri
p
t for gi
t
merg
e
tool
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
iley
Teach git mergeto
o
l to use cus
t
o
m
c
o
mmands defin
e
d
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles
B
ai
l
ey
Ch
a
nged
an internal va
r
iable
of merg
e
tool to
suppo
r
t
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tidy up git mergeto
o
l'
s
ba
c
kup file behaviour
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
gitk: Fi
x
the M
a
kefil
e
to cope with syste
m
s lacking
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bai
l
ey
Remove old g
e
nerated files fr
o
m
.
gitignore
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-19
Charl
e
s Bailey
Fix git-instaweb breakage
on MacOS
X due t
o
the
l
i
m
ited
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-12
Ch
a
r
les
B
ailey
Fix clone not to ignore dept
h
when performin
g
a l
o
cal
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
