repo.or.cz
/
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 'jk/info-alternates-fix' into maint
2017-11-13
Charles Bai
l
ey
grep:
f
i
x NO_
L
IB
P
C
R
E
1
_J
I
T to
fully
disa
b
le
J
IT
commit
|
commitdiff
|
tree
2016-07-01
Ch
a
rle
s
Bailey
grep
:
fix gr
e
ppi
n
g
for "i
n
tent to add" fil
e
s
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2016-07-01
Charles Ba
i
l
ey
t7810-grep
.
sh: fix a wh
i
t
e
space inconsistency
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2016-07-01
C
h
arl
e
s Bailey
t7810-grep
.
sh
:
fix d
u
plicated test name
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2016-06-21
Cha
r
l
e
s Bailey
t
7810: fix
d
uplicated test
title
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2015-12-04
Charle
s
Bailey
t340
4
:
fix quoti
n
g of redirect for some versio
n
s of
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-11-24
Charles Bailey
http: tr
e
a
t config options sslCAPath and sslCAInfo
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-07-17
Charles
B
a
ile
y
untracke
d
: fi
x
detection of u
n
a
me(2) failure
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-25
Charl
e
s Bailey
Fix definition o
f
ARRAY_SIZ
E
for non-gcc buil
d
s
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
C
h
a
r
l
e
s Bailey
contr
i
b/subtr
e
e: fi
x
br
o
ken
&&-chains
a
nd revealed
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Cha
r
les Bailey
contrib/subtre
e
: use tabs consit
e
ntly for
indentation
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Char
l
es
B
ail
e
y
parse-options: move u
n
si
g
ned
l
o
ng optio
n
parsing out
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles Bailey
test-parse-op
t
io
n
s: u
p
d
ate t
o
handle n
e
gativ
e
ints
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charle
s
Bailey
difftool: don'
t
as
s
um
e
t
h
at default
sh is
sane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bai
l
ey
m
ergetoo
l
: don't requi
r
e a work tree
fo
r
--
t
ool-h
e
lp
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
C
h
a
r
les Bailey
Fix contrib/s
u
b
t
ree Mak
e
file to patch
#
! li
n
e
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles Bailey
fil
t
er-branch: eliminate
d
up
l
icate map
p
e
d
pa
r
e
nts
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Bailey
c
o
m
p
at/bswap
.
h: det
e
c
t
e
ndianness on m
o
re
platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Cha
r
les Bailey
tests: don't rely
o
n strerror text w
h
e
n
testi
n
g rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
h
arles
Bailey
dir
.
c: m
a
ke git_f
n
m
a
tch() not
i
nline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bailey
mer
g
et
o
ol: Remove expli
c
i
t
references
t
o /dev/tt
y
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charl
e
s Bailey
s
t
a
s
h tests:
stash can lose data
in a file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
st
a
s
h: Don't ov
e
rwrite files that have gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
h
ar
l
es Baile
y
Documentation
:
Describe
other situations
w
he
r
e -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charle
s
Bailey
Ch
a
nge x
d
l_merg
e
to g
e
n
e
rate ou
t
pu
t
eve
n
fo
r
null
m
e
rges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
harles Bailey
t6023
:
m
e
r
g
e
-file
fails to output anything fo
r
a
degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
mergetool: fix r
u
n
n
i
ng mergetool
in su
b
-d
i
rectories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
mergetool: Add a test for running mergeto
o
l in a su
b
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles
B
ailey
mergetool
:
respe
c
t autocr
l
f by
u
sing chec
k
ou
t
-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Baile
y
merg
e
tool: Don't keep
temporary merge f
i
l
es unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Ba
i
le
y
m
e
r
get
o
o
l
:
A
dd pro
m
pt to cont
i
nue after faili
n
g to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Ch
a
rles Bailey
Add -y/--no
-
prompt
option to merget
o
ol
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Ch
a
rles
B
a
iley
Fix some tab/spac
e
inco
n
sistenci
e
s in
git-mer
g
etoo
l
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bail
e
y
git-arch
i
v
e: wo
r
k
i
n
b
are repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Baile
y
M
ake
git
archive
r
es
p
e
ct core
.
au
t
ocr
l
f
whe
n
cr
e
atin
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Char
l
es
B
a
i
l
ey
Add new
t
est to de
m
onstrat
e
g
i
t archiv
e
core
.
a
utocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles
Bailey
m
e
rge-tool
d
o
cument
a
tion:
de
s
cri
b
e custom command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Cha
r
les Ba
i
l
e
y
git-mergetool
d
ocumentaiton: show t
o
olnames in typewri
t
er
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
aile
y
Add
a very basic test scr
i
pt for
git mergetoo
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles
Bailey
Teach
g
it mergetool to use custom
command
s
defin
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Ba
i
ley
C
h
anged an internal variable
o
f m
e
rge
t
o
o
l to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bai
l
ey
Tidy up git m
e
rgetool'
s
backup file b
e
ha
v
iour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
gi
t
k
:
Fix the Make
f
ile to
cop
e
with s
y
stem
s
lack
i
ng
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bail
e
y
R
emo
v
e old generated
f
iles from
.
giti
g
nore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Char
l
es Baile
y
Fix git-instawe
b
breakage
on Mac
O
S
X due to
t
he li
m
ited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
F
i
x
c
lo
n
e not to ignor
e
depth when p
e
rforming
a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree