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
mingw: mark t9100's test cases with appropriate prereqs
2015-12-04
Charles Bailey
t3404:
fix
q
uoti
n
g of redirect f
o
r s
o
m
e
versions of
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-11-24
Charles Bailey
http: tr
e
at config options s
s
lCAPath
a
nd sslC
A
Info
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-07-17
C
h
arles Ba
i
ley
unt
r
a
cke
d
: fix detection of
u
name(2
)
failure
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-25
Charle
s
Bailey
F
i
x defi
n
iti
o
n of ARRAY_SIZE for no
n
-gcc
b
uilds
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Cha
r
les Bailey
contrib/subtr
e
e
:
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
contrib/
s
ub
t
ree: fix brok
e
n &&-chains a
n
d reveale
d
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Ch
a
r
l
es
Baile
y
contrib/subtree:
u
se tabs consitently for
i
n
dentatio
n
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles Bailey
pars
e
-
o
ptions
:
move uns
i
gned lo
n
g
o
p
t
i
on parsing out
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Char
l
es Bailey
test-pars
e
-o
p
tion
s
: update
to han
d
le
neg
a
tive ints
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bailey
difftool: don't assume that default
s
h i
s
sane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bailey
mergeto
o
l: d
o
n't
r
equire a work
tree for --tool-help
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
Charles
B
aile
y
Fix
c
o
ntrib/subtree
M
a
kef
i
le
t
o patc
h
#! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
C
h
arles Baile
y
filter-branch
:
eliminate dup
l
ica
t
e
ma
p
ped pa
r
ents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Cha
r
les Bailey
compa
t
/bswap
.
h: dete
c
t end
i
anness
o
n more pla
t
f
orms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bail
e
y
t
ests: don't rely on stre
r
ror text when
t
e
s
ting r
m
dir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Ch
a
rles B
a
iley
dir
.
c: make
git_fnmat
c
h
()
not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bailey
mergetool:
Remo
v
e explici
t
references to /d
e
v/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charl
e
s
Bailey
stash
t
ests: stash ca
n
lose data in a file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Ch
a
rles Baile
y
stash: Don't overwrite files that have gone
from
the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Cha
r
les Bailey
Documentation:
Describe other situations where -z a
f
fects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charl
e
s B
a
iley
C
hange xdl
_
m
er
g
e to generate output eve
n
for nu
l
l mer
g
es
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles B
a
i
l
ey
t6023: merge-fi
l
e fails to o
u
t
p
ut anyth
i
n
g for
a deg
e
nerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Ch
a
r
l
es Bailey
me
r
getool: fix running mergetool in sub-directo
r
ies
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Char
l
es Ba
i
l
e
y
me
r
ge
t
ool: Add a
test
fo
r
r
u
n
n
ing
m
ergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
merge
t
ool: respect autocrlf by using chec
k
out-
i
ndex
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Ch
a
rles Bailey
mergetool: Don't ke
e
p te
m
porary
m
er
g
e fi
l
es unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles
B
ailey
mergetool: A
d
d prompt to
c
ontinue after fai
l
ing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Add -y/--no-prompt
option
to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles
B
ailey
Fix some tab/spac
e
in
c
onsisten
c
ies 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 in ba
r
e r
e
pos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
rles
B
ailey
Ma
k
e git archive
re
s
pect core
.
a
u
tocrlf when creatin
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charle
s
B
ailey
A
dd new test to demons
t
rate git a
r
chive core
.
a
u
toc
r
lf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Baile
y
m
e
r
ge-t
o
ol documenta
t
ion: describe cus
t
om command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
git-merge
t
ool
do
c
u
m
entaiton: sh
o
w toolna
m
es in ty
p
ewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
ailey
Add a very b
a
sic test script
f
or
g
it mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bail
e
y
Teach g
i
t me
r
getool
to use cust
o
m
c
ommands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Ch
a
ng
e
d an interna
l
v
ar
i
able o
f
mergetool t
o
sup
p
o
r
t
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
ha
r
les Bailey
Tidy up git mergetool
'
s backup fi
l
e behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
gitk: Fix th
e
Makefile t
o
cop
e
wit
h
s
ystems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
h
a
rles Ba
i
l
e
y
Remove old ge
n
erated files from
.
g
itignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bai
l
ey
F
ix g
i
t-ins
t
a
w
eb b
r
eakage on MacOS X d
u
e to t
h
e
limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fix clo
n
e not t
o
ignore dept
h
when performing a
l
ocal
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree