repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'sn/null-pointer-arith-in-mark-tree-uninteresting'
2015-12-04
Char
l
es Bailey
t3404: fix
quoting o
f
redirect for some versions of
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-11-24
Charles Bailey
http: treat config
o
ptions s
s
lCAPath
and sslCAInfo
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-07-17
Charl
e
s
Baile
y
untracked:
f
ix
d
etection o
f
uname(
2
)
failure
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-25
C
h
ar
l
es Bail
e
y
Fix def
i
nition of
ARRAY_S
I
ZE for non-gcc bui
l
ds
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Ch
a
rles Bailey
contrib
/
subtree: small tidy-up to test
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles
Bailey
contrib/sub
t
ree: fix broken &&-c
h
a
ins
a
nd reve
a
led
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
C
h
a
r
l
es Bailey
c
o
ntrib/subtree: use
t
a
b
s
con
s
itently for inden
t
ation
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charl
e
s
B
ailey
parse-o
p
t
ions: m
o
v
e unsigned
l
o
ng option parsing out
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
C
harles Bai
l
ey
test-
p
a
r
se
-
option
s
:
u
p
d
ate to han
d
l
e nega
t
iv
e
i
nt
s
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bailey
difftoo
l
:
don't as
s
ume
t
hat d
e
fault sh is sane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles
B
a
i
l
ey
mergetool: do
n
't require
a work
t
ree f
o
r --tool-help
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
C
h
ar
l
es
B
ailey
Fix
c
o
ntrib/s
u
btree Makef
i
le t
o
patch #! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles B
a
i
l
ey
fil
t
er-
b
ranch: eliminate dupl
i
cate m
a
pped par
e
nts
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Char
l
es
B
ai
l
ey
compat/bswap
.
h:
d
e
t
ect endianness on
m
ore platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charle
s
Bail
e
y
t
ests:
don't r
e
ly on strerro
r
text wh
e
n testing rmdi
r
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
dir
.
c
: make git_fnmat
c
h() no
t
inli
n
e
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bailey
m
e
rgeto
o
l
: Remove explicit
references to /dev/tt
y
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Bailey
sta
s
h test
s
: stash can lose data in a file remove
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Ch
a
rl
e
s Bailey
st
a
sh: Don't ove
r
w
r
i
te f
i
les tha
t
hav
e
gone f
r
om the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
Document
a
t
ion: Describe
other situations
w
h
e
re -z affe
c
t
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Ba
i
ley
Change xdl_merge t
o
generate
o
utput eve
n
for null m
e
rges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
harles
Ba
i
ley
t6
0
23: merg
e
-
file fai
l
s to output any
t
hing for
a
dege
n
e
rate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
arles Bailey
mer
g
etool:
f
ix
running
me
r
getool
i
n s
u
b-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charle
s
Bailey
merge
t
o
ol: Add a
te
s
t
for run
n
ing me
r
g
etool in a
s
ub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Char
l
es Bailey
mergetoo
l
:
respect
autocrlf by using
c
heckout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Ch
a
rles Bailey
me
r
ge
t
ool: Don't keep temporary merge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Ch
a
rles
B
ailey
mergetool: Add prompt to continue after
f
a
iling t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Ch
a
rles
Ba
i
le
y
Add -y/-
-
no-prom
p
t option to
m
e
rgetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
harles Bailey
Fix so
m
e tab/space in
c
onsistencies
i
n g
i
t-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
g
it-arc
h
i
v
e: w
o
rk in bare repo
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Ba
i
le
y
Make
git arc
h
ive r
e
s
p
ect co
r
e
.
a
u
tocrlf when
c
r
ea
t
ing
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bail
e
y
Add n
e
w test to demonstra
t
e git
archive
c
o
re
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles B
a
iley
merge-too
l
d
o
cumentation:
d
escribe
custom command u
s
age
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
harl
e
s Baile
y
git-mergetool documentaiton:
sho
w
toolna
m
es in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
i
ley
Add
a very basic t
e
st
s
c
r
i
pt for git mer
g
etool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Baile
y
Teach git mergetool to
use custom commands de
f
i
n
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Baile
y
Changed an inter
n
al variable
o
f
me
r
getool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les Bailey
T
i
d
y
up git mergetool's bac
k
up
f
ile be
h
aviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charl
e
s
B
ai
l
ey
gitk: Fix
t
he
M
a
kefile to co
p
e with s
y
stems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charle
s
Bailey
Remove old
generat
e
d files from
.
g
i
tignor
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
Fix git
-
i
nstawe
b
breaka
g
e on MacOS X d
u
e to the
limi
t
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Ch
a
rles Bailey
Fix clone no
t
to
ignore
d
epth when perfo
r
min
g
a
l
o
cal
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree