repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'dt/fsck-verify-pack-error' into maint
2015-12-04
Charl
e
s Bailey
t34
0
4: fix qu
o
ting of r
e
direct fo
r
some versions
of
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-11-24
C
h
arles Bailey
ht
t
p: tre
a
t config optio
n
s
sslC
A
P
a
t
h and
s
slCAInfo
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-07-17
Cha
r
les Bailey
u
ntrac
k
ed: fix d
e
t
e
ct
i
o
n
of u
n
a
m
e(2) failure
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-25
Charles
Bailey
Fix definiti
o
n of ARRAY_SI
Z
E for
n
on-gcc
b
ui
l
d
s
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Ch
a
rles Bailey
cont
r
ib/su
b
tree: s
m
all ti
d
y-up t
o
test
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
C
h
a
r
les Bailey
co
n
t
r
i
b
/subtree: fix broken &&-chains a
n
d revealed
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charl
e
s Bai
l
ey
contrib/subt
r
ee: use
t
abs con
s
itently for indentat
i
on
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
C
h
arl
e
s Bailey
parse-o
p
tions: move unsigned lon
g
option parsing
o
u
t
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles
Baile
y
test-parse-o
p
t
ions:
u
pdate t
o
handle
n
egativ
e
ints
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Char
l
es Bai
l
ey
dif
f
too
l
: don
'
t assume t
h
at default sh is
san
e
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles
Bail
e
y
m
erge
t
ool:
d
on't re
q
uir
e
a
work tre
e
for --tool-he
l
p
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
Cha
r
le
s
Bailey
Fix contrib/
s
u
btree Makefile to
p
atch
#
! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles
Ba
i
ley
filter-branch: el
i
mi
n
ate duplicate map
p
e
d
parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
C
harles Bai
l
e
y
compat/bswap
.
h: detect en
d
i
a
nn
e
s
s on m
o
re p
l
a
t
fo
r
m
s
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bai
l
ey
tests:
d
on'
t
rely on
s
trerror text when test
i
ng rmd
i
r
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bail
e
y
dir
.
c: make git_
f
nmatch() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charl
e
s Bailey
mergetool: Remove explicit ref
e
re
n
ces to
/
dev
/
tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Bailey
stash tests: stash can lose data in a file r
e
moved
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
h
ar
l
es Bailey
stas
h
: Don't overwrite f
i
les
t
h
a
t have gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Ch
a
rles
B
ailey
D
o
c
u
m
e
n
tation: Des
c
ribe
o
t
h
er situat
i
ons where -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles
Ba
i
ley
C
h
ange xdl_merge to gen
e
rate output even for null mer
g
es
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t
6023:
m
e
rge-fil
e
fails to ou
t
put anyth
i
ng
for a
d
egenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Ch
a
rles Bailey
merget
o
o
l
: fix running mer
g
e
tool in sub-directori
e
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Char
l
es Bailey
mergetool: Add a test for running mergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Ch
a
rles Bailey
mergetool: respe
c
t a
u
tocrlf by
using ch
e
c
k
out-
i
ndex
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Ch
a
rles B
a
il
e
y
merge
t
ool:
D
on
'
t
keep tempor
a
ry me
r
ge
f
ile
s
unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
arles Bailey
mergetool:
Add prom
p
t
to continue after fail
i
n
g t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charle
s
Baile
y
Add
-
y/--no-prompt opti
o
n to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Ba
i
l
e
y
F
ix some tab/spac
e
inconsi
s
tencie
s
i
n
git-
m
ergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charl
e
s B
a
iley
gi
t
-archive: work in b
a
re
r
epos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles
B
ailey
M
ake git arc
h
i
ve r
e
spec
t
c
ore
.
autocrlf when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Char
l
es Bailey
Add new te
s
t to demonstrat
e
git archive core
.
a
utocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
merge-tool documentation
:
des
c
ribe custom command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bail
e
y
g
i
t-
m
ergetoo
l
documentaiton: show toolnames in typewr
i
ter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles Bailey
Add a
v
e
r
y basic test scrip
t
for git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Baile
y
Te
a
ch git mergetool to
u
se cus
t
om command
s
defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es B
a
iley
Chan
g
ed an inter
n
al variable of mergetool to suppo
r
t
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
ar
l
es B
a
i
l
ey
T
i
dy up git merge
t
ool's backup
f
il
e
beha
v
iour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
C
h
a
rles B
a
ile
y
gitk: Fix th
e
Ma
k
efil
e
to cope
with sys
t
ems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charle
s
Bailey
Rem
o
v
e
o
l
d generated fi
l
e
s from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles
Bailey
F
ix
g
it-instaweb bre
a
kage on
M
acOS X due t
o
t
he
l
imited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles
Bailey
Fix clo
n
e not
t
o ignore depth when pe
r
f
o
r
m
ing
a
local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree