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: respect autocrlf by using checkout-index
2009-01-27
Charles Ba
i
ley
merge
t
o
o
l:
r
espect au
t
ocrl
f
by using checkout-index
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-12-13
Ch
a
rles
Bailey
me
r
getool: Don't keep
t
emporary merge fil
e
s
unless
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-12-13
Cha
r
le
s
Bailey
merg
e
tool: A
d
d prompt to c
o
n
ti
n
ue after
f
a
iling to
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-11-15
Char
l
es Bai
l
ey
Add -
y
/--no-prompt option
to merg
e
tool
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fix some tab/s
p
a
ce inconsis
t
en
c
ies in git-mergetool
.
sh
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
git
-
archive: work in ba
r
e repos
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make git archive respect core
.
a
ut
o
crlf
when c
r
eating
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-09-19
Char
l
es Bailey
Add new test t
o
demonstrate git a
r
ch
i
ve core
.
autoc
r
lf
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
merge-tool documentatio
n
: describ
e
cust
o
m command usage
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-08
Charl
e
s Bailey
g
it
-
mergetool
doc
u
mentait
o
n: show too
l
na
m
es in typewrite
r
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
l
e
s Bailey
Ad
d
a very basic test
sc
r
ipt for git me
r
ge
t
ool
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
iley
Teach
git m
e
rgetool
t
o use
c
us
t
om command
s
def
i
ned
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
B
ailey
C
h
anged an
i
n
ternal
variable of mergetool to supp
o
rt
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bai
l
ey
T
i
dy up git merget
o
ol's bac
k
up file behaviou
r
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-01-11
Cha
r
les
B
ailey
gitk: Fix the Mak
e
file to cope with sys
t
e
ms lacki
n
g
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-21
Charle
s
Bailey
R
emov
e
old generated files fr
o
m
.
gitigno
r
e
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-19
Charles B
a
ile
y
Fix git-inst
a
web br
e
akage
o
n MacOS X due to the lim
i
ted
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-12
Charles Ba
i
ley
Fix clo
n
e not to ign
o
re dept
h
when performing a local
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree