repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'mh/strbuf-read-file-returns-ssize-t'
2015-06-25
Charles Bailey
Fix def
i
nition of ARRAY_SIZE
for non-gcc bu
i
lds
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Ch
a
rles
Baile
y
c
o
ntr
i
b
/
subtree: s
m
al
l
tidy-u
p
to test
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles Bailey
c
o
ntrib
/
s
u
b
tr
e
e
:
fix broken &
&
-chains and revealed
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
C
h
a
rles
B
aile
y
c
ontrib/
s
ubtree
:
use tabs
c
onsitent
l
y for in
d
entation
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles Ba
i
ley
d
ifftool: don't assum
e
that
d
efault sh is sane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charl
e
s Baile
y
mer
g
etool: don't require a work
t
r
ee for --too
l
-help
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
C
ha
r
les Bail
e
y
F
i
x co
n
tri
b
/s
u
b
t
re
e
Makefile to patch #! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles Bail
e
y
filter
-
bra
n
c
h: elimi
n
ate
d
up
l
icate mapped paren
t
s
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
C
har
l
es Bail
e
y
com
p
at/bswap
.
h: detect end
i
anness on more
platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charle
s
Ba
i
ley
tes
t
s: don'
t
rely on strerr
o
r
t
ext when testing rmd
i
r
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Cha
r
les Bailey
dir
.
c: make git_fnmatch()
n
ot
i
nli
n
e
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Ba
i
ley
mergetool: Remove explic
i
t
referen
c
es to /de
v
/tt
y
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles B
a
i
ley
stash
t
ests
:
stash can l
o
se data in a file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
st
a
sh: Don't overw
r
ite f
i
les th
a
t have gon
e
from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles
B
a
i
ley
Documen
t
ation: Des
c
r
i
b
e ot
h
er situatio
n
s where -z affe
c
ts
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
har
l
e
s
Bail
e
y
Change xdl_merge to gene
r
a
te
o
ut
p
ut even for null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Ch
a
rles Bailey
t6023
:
m
erge-file fails to
output anything for a dege
n
erate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charle
s
Bailey
mergetool: fix run
n
ing mergetool in sub
-
directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles B
a
iley
me
r
getoo
l
: Add a
test for
running me
r
getool in
a
sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
mergetool:
respect aut
o
cr
l
f
by us
i
ng checkout-
i
nd
e
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
a
rles Bail
e
y
mergetool:
D
o
n
't keep t
e
mporary merg
e
fil
e
s
unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Char
l
es Baile
y
mergetool: Add
promp
t
to continue after
failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
arles Ba
i
le
y
Add -y/--no-prompt option
t
o mergetoo
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fix some tab/space inconsist
e
n
c
ies
i
n git-m
e
rgeto
o
l
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Ch
a
rles
B
ailey
git-arc
h
ive: work in
b
are repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles
Bailey
Make git archive respect core
.
a
utoc
r
l
f
when
c
r
eating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Cha
r
les
B
ailey
A
dd new test t
o
demonstrate g
i
t a
r
chi
v
e core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Baile
y
me
r
ge
-
tool doc
u
mentation: describe cus
t
o
m
c
omma
n
d usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Char
l
e
s Bailey
git-merge
t
ool
d
o
c
u
mentaito
n
: show toolnames in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles Bailey
A
d
d a very basic
t
est script for gi
t
mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles Bailey
Teach
git merget
o
o
l to use c
u
sto
m
commands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s Bail
e
y
Change
d
an internal vari
a
bl
e
of mer
g
etool to sup
p
ort
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s Bailey
Tidy up git mergetool's ba
c
ku
p
f
ile behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
gitk:
F
ix the Makefile to cope with syst
e
ms lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
h
arle
s
Bail
e
y
Remove old gen
e
r
ated files from
.
giti
g
no
r
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Ch
a
r
l
es Bailey
Fix git-insta
w
eb breakage on MacO
S
X due to the limite
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
harle
s
Bailey
Fi
x
clone not
t
o
i
gnore dept
h
when perform
i
n
g
a lo
c
al
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree