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
t5700: demonstrate a Windows file locking issue with `git clone --dissociate`
2015-06-25
Cha
r
les Bailey
Fix
d
e
finitio
n
of ARRAY_
S
IZE for non-gcc buil
d
s
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bailey
difftoo
l
:
don't
assume th
a
t de
f
au
l
t s
h
is sane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
C
harles Bailey
merge
t
ool:
don't requir
e
a work tre
e
fo
r
-
-
tool-help
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
Charles
B
ailey
Fix contr
i
b/su
b
t
ree Makefile
t
o
patch #! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
C
harles Bailey
filter
-
b
r
anch: eliminate
d
uplica
t
e mapped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
C
h
arles Bailey
c
o
mpat/bswap
.
h: detect endian
n
ess
o
n mor
e
platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bai
l
e
y
tests: d
o
n't rely on s
t
rerror text w
h
e
n
testing rmdi
r
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Char
l
es
B
ail
e
y
d
i
r
.
c:
m
ake git_fnmatch() n
o
t inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Cha
r
les
B
ailey
me
r
getool: Remov
e
ex
p
licit ref
e
rences to
/dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Ch
a
rles Bailey
sta
s
h
tests: stash can l
o
s
e
data in a file re
m
oved
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bai
l
ey
st
a
sh: Do
n
't overwrit
e
files that have gone from
the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles
B
a
iley
Documentation
:
Describe
other si
t
uations where -z affect
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Char
l
es Bailey
Change xdl_me
r
ge
t
o gen
e
rate output even for null merge
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
harles B
a
i
l
e
y
t6
0
23: merge-file f
a
ils to outpu
t
a
n
yth
i
n
g for a degener
a
te
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
a
r
l
e
s
Bailey
m
e
r
getool: fix r
u
n
n
i
ng mergetool in sub-direc
t
ories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
m
e
rgeto
o
l: Add a test for running mergeto
o
l
i
n a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
merget
o
ol: respect a
u
tocrlf by using checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetool: Don't k
e
ep t
e
mporary me
r
g
e files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Char
l
es Bailey
m
e
r
g
e
tool:
Add pro
m
pt to
c
ontinue
afte
r
failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Ch
a
rles
Bailey
Add -y/--no-prompt optio
n
t
o
me
r
ge
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles B
a
i
ley
Fix some tab/spa
c
e inconsis
t
encies in git-mergeto
o
l
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
C
h
a
rles
Ba
i
ley
git-
a
rchive:
w
o
rk in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
h
a
rles Bai
l
ey
Make git archiv
e
respe
c
t core
.
autocrlf
w
hen cr
e
ating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charl
e
s Baile
y
Add n
e
w test to demonstrate
git
archive core
.
autoc
r
lf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charle
s
Bail
e
y
merge-
t
ool documen
t
a
t
ion: d
e
scribe cu
s
tom command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles
Ba
i
ley
g
it-me
r
get
o
o
l documentaiton: show toolnames in type
w
ri
t
er
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les
Bailey
A
dd a very basic tes
t
script for git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
ha
r
les Bailey
T
e
ach git
m
e
r
ge
t
ool
to use
custom co
m
man
d
s defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Bailey
C
h
anged an
i
nternal variable
of me
r
g
e
t
ool
to sup
p
ort
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles Bailey
Tidy up gi
t
mergetool's backu
p
file behavio
u
r
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Char
l
e
s
B
ailey
g
i
tk:
Fix the M
a
kefile
to cope with systems l
a
cking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
h
ar
l
es Ba
i
ley
R
e
move old generated files
from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Ba
i
ley
Fix git-instaweb breakag
e
o
n
M
acOS X
d
u
e to the limit
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charl
e
s Bai
l
ey
F
i
x clone
n
ot to ignore dep
t
h when
perfor
m
i
n
g a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree