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 'cb/t7810-test-label-fix' into maint
2016-06-21
C
h
a
r
les B
a
i
l
ey
t
7810: fix dupli
c
ated test
t
i
tle
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2015-12-04
Charl
e
s Bail
e
y
t3404: fix quo
t
ing of
r
edirect for
s
ome
versio
n
s of
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-11-24
Charles
Bailey
h
ttp: tr
e
at config options sslCAPath and ss
l
C
A
Info
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-07-17
C
harles Bailey
untracke
d
:
f
ix de
t
ecti
o
n of unam
e
(2
)
fa
i
lure
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-25
C
h
arles
Bailey
F
i
x
d
e
f
i
n
ition
o
f ARRAY_SIZE for non-
g
cc bu
i
lds
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles
Bai
l
e
y
contr
i
b/subt
r
ee: smal
l
tid
y
-up
t
o test
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
C
h
arles
Bailey
contrib/subtree:
f
i
x broken &&-chains and revealed
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Ch
a
r
l
e
s
Bailey
contrib/subtre
e
: us
e
ta
b
s c
o
n
s
it
e
n
tly for indentatio
n
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Ch
a
rles Bailey
parse-o
p
tions: move
u
nsigned lon
g
option parsing out
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Cha
r
les Bailey
test-par
s
e-op
t
io
n
s
: up
d
ate
t
o hand
l
e negative ints
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charl
e
s Bail
e
y
diff
t
ool: don't assu
m
e that de
f
aul
t
sh is sane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles
B
a
iley
mergetool: don't requ
i
r
e a work tree fo
r
--tool-he
l
p
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
Charles
Baile
y
Fix contrib/s
u
btree
M
ake
f
ile
to patch #! l
i
ne
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles
B
ailey
f
i
lter-
b
ran
c
h: eliminate duplica
t
e mapped pa
r
ents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles
Bailey
compat/bsw
a
p
.
h: detect endianne
s
s
o
n
more platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Cha
r
l
es Bailey
tests: don
'
t rely on strerror t
e
xt wh
e
n
t
est
i
ng
rmd
i
r
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charle
s
Bailey
dir
.
c: mak
e
g
i
t_fnm
a
tc
h
() n
o
t i
n
line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bailey
mergetool: Remove explicit references to /dev/
t
ty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charl
e
s B
a
iley
stash tests:
stash can lose data in a file
r
emoved
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
stas
h
: Don't overwrite files tha
t
hav
e
g
o
ne fr
o
m the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
D
ocumentati
o
n
:
Describ
e
other situ
a
tions wh
e
re -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles
B
ailey
Change xdl_merge to generate output even for null me
r
ges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Ch
a
r
les Bailey
t
6
0
23: merge-file fails to outp
u
t anything
f
or
a
d
e
g
enera
t
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles
B
ailey
m
e
r
g
e
tool: fix runni
n
g
merg
e
tool
i
n sub-dir
e
ctories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Cha
r
les B
a
iley
mer
g
etool: Add a test
for running mergetool in a s
u
b
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Cha
r
les
Baile
y
me
r
g
e
t
ool: re
s
p
ect autocrlf by u
s
i
n
g
c
heck
o
ut-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles
B
ai
l
ey
mergetoo
l
: Don't kee
p
tempor
a
r
y
m
e
rge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
me
r
get
o
ol: Add
pr
o
mpt
t
o cont
i
nue aft
e
r failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Add -y/--no-prompt opti
o
n
t
o
mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fi
x
some
t
a
b/space inconsistencies in git-merget
o
ol
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
git-archive
:
work
i
n bare
r
epos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
M
a
ke git archive respect co
r
e
.
autoc
r
lf w
h
en
cr
e
ati
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Add
new test to demon
s
trate git archiv
e
core
.
aut
o
crlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles
B
ailey
merge-tool do
c
umentation: descr
i
be c
u
s
t
om command us
a
g
e
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
har
l
es Bailey
git-
m
erget
o
ol doc
u
men
t
aito
n
: show
t
o
olnam
e
s in typewr
i
te
r
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bailey
Add a very basic test script
f
or gi
t
mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles B
a
iley
Teach git mergetool to
u
se custom c
o
mmands defi
n
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s Bail
e
y
C
hang
e
d an inter
n
al v
a
r
iabl
e
o
f
mergeto
o
l
to sup
p
ort
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Bailey
Tidy u
p
git
mergetool's backup fil
e
behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charl
e
s Bailey
git
k
: Fix the Ma
k
efile to cope with syste
m
s
lackin
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
h
arles Bailey
Remove ol
d
generated files
from
.
gitign
o
re
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Ba
i
ley
Fix git-i
n
stawe
b
b
reakage on MacOS X
due to the
l
i
mited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fix clone not to ignor
e
depth when
p
e
r
formi
n
g
a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree