repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'rs/fsck-nul-header'
2015-11-24
C
ha
r
les Bailey
htt
p
: tre
a
t config options sslC
A
Path
a
nd sslCAInfo
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-07-17
C
harles Bai
l
ey
u
n
tracked:
fix
detection o
f
uname(2) failure
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-25
Ch
a
rles Bai
l
ey
Fix defi
n
it
i
on of ARRA
Y
_
SI
Z
E for non-g
c
c builds
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles
B
ailey
co
n
trib/subtree: small tidy-up to test
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Char
l
e
s Bailey
co
n
tr
i
b/subtree: fix broken &&-cha
i
n
s
and revealed
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles
Bailey
co
n
trib/sub
t
ree: use tabs consitently f
o
r
i
nde
n
tation
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles Bailey
p
arse-options:
m
ove
u
nsigned lo
n
g option parsing out
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles Bailey
test-parse-options:
upda
t
e to hand
l
e neg
a
tive int
s
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles
B
ailey
difftool: d
o
n't assume that default sh is s
a
ne
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Cha
r
les Baile
y
mergetool: don't
req
u
ire a w
o
rk tree for --tool
-
help
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
C
harles Bailey
F
i
x contrib/sub
t
ree
M
akefile t
o
patch #! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Ch
a
rles Bailey
f
i
l
ter-branch:
eli
m
i
n
ate duplicate mapped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
C
h
a
rle
s
B
a
i
le
y
compat/bswap
.
h
:
detect
endianne
s
s on more platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles
B
a
i
l
e
y
tes
t
s: don
'
t rely
o
n
strerror text wh
e
n testing rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles B
a
i
l
ey
dir
.
c
:
make
g
i
t
_
fnmatch() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Cha
r
le
s
Bailey
merge
t
ool: Remove exp
l
ic
i
t references
to
/
dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Char
l
es Baile
y
stas
h
tes
t
s:
s
tash can lose data in a fi
l
e removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
s
tash
:
Don't overwrite files that have gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
h
arle
s
Bailey
Documentation: Describe oth
e
r
s
ituation
s
where -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
arle
s
Bailey
C
h
ange
x
dl_merge to generate o
u
tput ev
e
n fo
r
null m
e
rges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Cha
r
les Bailey
t
6023:
merge
-
file fai
l
s to out
p
ut
a
nything for
a
d
ege
n
e
r
ate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
mergetool: fix ru
n
ning mergetool i
n
sub-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles B
a
iley
mergeto
o
l: Add a t
e
s
t
f
o
r ru
n
ning mergetool i
n
a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
merget
o
o
l
:
respect autocrlf b
y
using checkout-i
n
dex
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
arles B
a
iley
m
ergetoo
l
: Don
'
t keep temporary m
e
rge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charle
s
Bai
l
e
y
mer
g
e
t
ool: A
d
d promp
t
t
o
c
ontinue after faili
n
g
t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Baile
y
A
dd -y
/
--no-pr
o
mpt opt
i
on
to
m
ergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fix some tab
/
space inconsistenci
e
s in git-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charle
s
Bailey
git-
a
r
c
hi
v
e: work i
n
bare
r
ep
o
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make git archive respect
co
r
e
.
autocrlf
w
hen creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Add new test to demons
t
r
ate git archive core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rles Bailey
m
e
rge-tool docume
n
t
ati
o
n: describ
e
custom com
m
and us
a
ge
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charl
e
s B
a
il
e
y
gi
t
-
m
ergetool documentaiton: sh
o
w
t
ooln
a
me
s
in ty
p
e
writer
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rle
s
Bailey
A
d
d a
v
ery
ba
s
i
c test script for git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tea
c
h git mergetool
t
o
use custom commands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
iley
Chan
g
ed an internal vari
a
ble of m
e
rgetool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
a
rles B
a
iley
T
idy up git merg
e
tool's
backup file beh
a
vi
o
ur
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
g
i
tk: Fix the Makefile to cope with syst
e
ms lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
harles Bailey
Remove old generated
files fr
o
m
.
giti
g
n
ore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bail
e
y
Fix gi
t
-instaweb breakage on MacOS X
due to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fix clone not to ig
n
ore
depth whe
n
pe
r
formi
n
g
a
loc
a
l
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree