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
Merge branch 'nd/multiple-work-trees'
2015-06-25
Charles
Bailey
Fix definiti
o
n of ARRAY_SIZE fo
r
non-gcc
b
uilds
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Char
l
es Bailey
contrib/subt
r
ee: small tidy-up to
t
est
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
C
h
arles Bailey
contrib/s
u
bt
r
ee: fix broke
n
&
&
-chains
a
nd revealed
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Cha
r
les
Bailey
contrib/subtree: use tabs consitentl
y
for inde
n
tation
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charle
s
B
ailey
difftool: don't assume that
default sh is
s
ane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bailey
m
erg
e
tool: do
n
'
t require a work
t
r
e
e
f
or
-
-to
o
l-help
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
Charles Bai
l
ey
Fix contrib/s
u
b
tre
e
Makefile to
p
atch
#
! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles Bailey
filter-branch:
el
i
minate duplicate mappe
d
parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
C
ha
r
les Bailey
compat/
b
swap
.
h: detect
endianness
o
n
more platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bail
e
y
te
s
ts: don
'
t rely on stre
r
ror text wh
e
n testi
n
g
r
m
dir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charl
e
s B
a
iley
dir
.
c:
m
ake git_
f
nma
t
ch() not
i
nline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
C
h
arles Bailey
m
e
rg
e
tool: R
e
mo
v
e exp
l
icit reference
s
to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles
Bailey
stash tests: stas
h
can lose
d
ata in a
f
ile removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
stash: Don't o
v
er
w
rite f
i
les that
have gone from
the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles
B
ai
l
e
y
Documenta
t
ion: Des
c
ribe
o
th
e
r situations where -
z
affec
t
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles B
a
iley
Change xd
l
_merge to generat
e
output even for n
u
ll merge
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charl
e
s Bailey
t
6
023: me
r
ge-file fails to output anything for a degen
e
rate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles
B
ailey
merge
t
ool: fi
x
running me
r
getool
in sub-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Char
l
es Bailey
merg
e
tool: Add a test for running mergeto
o
l in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Baile
y
merg
e
tool: respect
a
u
tocrlf by u
s
ing checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charle
s
Bailey
mergetool:
D
on't keep
temporary merge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
harl
e
s B
a
iley
mergetool: Add prompt
to c
o
nti
n
ue after fa
i
ling to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Add -y/--
n
o-prompt opti
o
n to merget
o
ol
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bail
e
y
Fix some tab/s
p
ace
inconsi
s
tencies in
g
it-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
C
h
arles Baile
y
git-archive: w
o
r
k in
b
a
r
e
repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Cha
r
les
Bailey
M
ake
git
arch
i
ve respect core
.
autocrlf
when crea
t
ing
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
h
arles Bailey
A
dd new test to d
e
mon
s
trate gi
t
archiv
e
cor
e
.
aut
o
crlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
arles Bailey
m
e
rge-tool docu
m
entation
:
des
c
r
i
b
e cus
t
om
com
m
and usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
harles Bailey
git-
m
ergetool
d
oc
u
mentaiton: sh
o
w toolnam
e
s in ty
p
ewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Ba
i
ley
Add
a very
basic te
s
t script
f
o
r
g
i
t me
r
getool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bail
e
y
Teach git merg
e
tool to use c
u
stom
commands def
i
ned
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Changed an
i
nt
e
rna
l
variabl
e
o
f
mergetool to
suppor
t
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
T
i
d
y
u
p git
mergetool's
backup fi
l
e
b
e
ha
v
iour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles
Bailey
g
i
tk: Fi
x
the
Mak
e
file
t
o
c
ope
with s
y
st
e
ms la
c
k
i
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
R
e
move
old generated files from
.
g
i
tignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Char
l
es Bail
e
y
Fix git-i
n
sta
w
eb br
e
akage on MacOS X
d
u
e to
the
l
i
mited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
h
arles Bailey
Fi
x
clone
not to ignore depth when
p
erforming a l
o
cal
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree