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
MinGW: disable legacy encoding tests
2014-07-01
Charles Bai
l
ey
f
i
lter-branch: e
l
im
i
nate duplicate ma
p
pe
d
parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Bailey
compat/bswap
.
h
: d
e
tect
e
ndianness on more platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles
Ba
i
ley
tests: don'
t
rely on
strerror text when
t
esting rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bail
e
y
d
ir
.
c: make git_fnmatch() not inl
i
ne
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Ba
i
ley
m
ergetool: Remove
e
xplicit references t
o
/dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Bailey
stash tests
:
stash can lose
d
at
a
in a
file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bai
l
ey
s
ta
s
h
:
Don't overwrit
e
files tha
t
have gone
f
rom
the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
harle
s
Bailey
Do
c
umenta
t
i
o
n
:
Describe other situati
o
ns where -z
a
ffects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Cha
r
le
s
Bailey
Chang
e
xdl_merge to gene
r
ate out
p
ut e
v
e
n for null mer
g
es
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t6023: merge-file fails to output anything for
a
degenerat
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charle
s
B
ail
e
y
mergetool: fix running
mergeto
o
l in su
b
-direct
o
ries
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
harles
B
ailey
mer
g
etool: Add a test f
o
r running mergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Cha
r
les Bailey
merg
e
tool: respect au
t
ocrlf
by
u
sing checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Ch
a
r
les
Ba
i
le
y
merge
t
ool: Don't kee
p
te
m
porary merge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bail
e
y
mergetool: Add prom
p
t t
o
continu
e
a
fter failing
to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charle
s
Bailey
Add -y/--no-prompt option to m
e
r
getool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Cha
r
les Baile
y
Fix
some tab/sp
a
ce i
n
consist
e
ncie
s
in git
-
merg
e
tool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
git-archive: work in bare
repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make
git archive resp
e
ct co
r
e
.
auto
c
rlf when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles
B
ailey
A
dd new
test to de
m
onstrate git a
r
chive
c
o
r
e
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
harles
B
aile
y
m
e
r
g
e-tool
documentation: describe custom command
usa
g
e
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Baile
y
g
i
t-mer
g
etool documentaiton:
show toolnames in typ
e
writer
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Ad
d
a very
b
asic t
e
st scri
p
t
for
g
it mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s Bailey
T
each git merget
o
ol to use custom command
s
def
i
ned
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
iley
Changed an internal variable o
f
mergetool to suppor
t
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Baile
y
Tidy up git mergetool's b
a
ckup file b
e
hav
i
o
u
r
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charle
s
Bail
e
y
g
i
tk: Fi
x
the
M
akefil
e
to cope with sy
s
tems
l
a
c
kin
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
ha
r
les Bailey
R
e
mov
e
old g
e
n
e
ra
t
e
d fi
l
es from
.
g
i
tignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
F
i
x git-insta
w
eb breakage on M
a
cO
S
X due to the li
m
ited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
harles Bailey
Fix
clone
n
ot to ig
n
ore d
e
pth wh
e
n per
f
orm
i
ng a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree