repo.or.cz
/
git
/
haiku.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
mergetool: fix running mergetool in sub-directories
2009-01-31
Charles Bailey
m
e
rgeto
o
l:
f
ix runni
n
g mergetool in sub-directories
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
mer
g
etool: Add
a
test for runn
i
ng mergetool in a sub
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2009-01-27
Ch
a
rles
B
ailey
mergetool:
r
espe
c
t autoc
r
lf by using chec
k
ou
t
-index
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
m
erge
t
o
o
l: Don't keep tempora
r
y
merge fi
l
es un
l
ess
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-12-13
Charle
s
Bailey
mergetool: Add prompt
to continue after
f
aili
n
g
to
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-11-15
Charles
B
ailey
Add -y/--no-p
r
ompt opti
o
n to mergetool
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-11-15
C
h
arles Bailey
Fix
some tab/space inconsiste
n
c
ies in git-merg
e
tool
.
sh
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-10-26
Charles Ba
i
ley
git-a
r
chive: work in bare repos
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make git archi
v
e r
e
spect
c
ore
.
autocrlf w
h
e
n creating
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-09-19
C
harles Bai
l
ey
Add new tes
t
to demonstrate git archiv
e
core
.
autocrlf
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
merge-tool do
c
umentat
i
on
:
d
e
scribe custom command usage
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rles Bailey
git-mergetool documen
t
aiton: show toolnam
e
s in
t
ype
w
riter
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
C
h
a
rles Bailey
Add a v
e
r
y
b
a
sic test script
f
or
git merge
t
ool
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Teac
h
git mer
g
et
o
ol to
u
s
e custom commands
d
efined
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rle
s
Bai
l
ey
C
h
anged an inte
r
nal var
i
ab
l
e
o
f mergetool
t
o suppor
t
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
iley
Tidy up
git m
e
rgetool'
s
backup file
b
e
hav
i
our
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-01-11
Ch
a
r
l
es B
a
iley
gitk: Fix the Ma
k
e
f
i
le
t
o
c
ope wi
t
h systems lac
k
ing
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bai
l
ey
R
emove old generated fil
e
s from
.
gitignore
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
Fix
g
it-ins
t
aweb
b
reakage on
MacOS X due to the lim
i
t
e
d
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-12
Charl
e
s Bailey
Fix clone not to ignore d
e
pth wh
e
n performing a
local
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
