repo.or.cz
/
alt-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 'cb/array-size'
2015-06-25
Charles Bailey
Fix definition of ARRAY_SIZE for non-
g
cc b
u
ilds
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bailey
di
f
ftool
:
do
n
'
t a
s
sume that
defau
l
t sh is
s
ane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charl
e
s Bailey
merg
e
tool
:
don't require a work tree for
-
-tool-he
l
p
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
C
harles Bailey
Fix contrib/s
u
btree Mak
e
fi
l
e to patch #! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charle
s
Bailey
f
i
lter-b
r
anch: eliminate dupli
c
ate mapped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Cha
r
les Bailey
compat/bswap
.
h: detect endianness on more platfor
m
s
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Ch
a
rles Bailey
t
e
sts: don't rely o
n
strerror
text when testing r
m
d
i
r
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charle
s
Bailey
dir
.
c: make
gi
t
_
fnmatch(
)
not inl
i
ne
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charle
s
Bailey
m
erge
t
oo
l
: Remo
v
e explicit references
t
o /
d
ev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Ch
a
r
l
es
Bailey
s
t
as
h
t
e
sts: stash 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
stash:
D
on't ove
r
w
rite files that have gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charle
s
Bailey
D
ocume
n
tation: Describe other s
i
tuati
o
ns where -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
harles Bailey
Change xdl_me
r
ge to generate output
e
v
e
n for null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
arles Bailey
t6023: merge-file f
a
ils to ou
t
put
anything for
a
degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bai
l
e
y
m
ergetool: fix
run
n
ing me
r
getool in sub-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bai
l
ey
mergetool: Add a
test for running mer
g
e
t
ool in
a
sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charl
e
s
Baile
y
merg
e
tool: re
s
pect aut
o
crlf by u
s
ing che
c
kout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Baile
y
m
ergetool: Don't keep temp
o
rary merge fi
l
es unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Baile
y
m
e
rgetool: Add
p
rompt to contin
u
e
after
f
ail
i
ng t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charl
e
s Baile
y
A
d
d -y/
-
-
no-prompt option to m
e
rgetoo
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bail
e
y
F
i
x some tab/space inco
n
sist
e
ncies in gi
t
-merge
t
ool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
git-archive:
w
ork in
b
are repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Ma
k
e git a
r
chive respect cor
e
.
a
u
t
o
c
r
lf when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Add new test t
o
de
m
onstrate
g
it archi
v
e core
.
au
t
ocrl
f
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Char
l
es Bailey
me
r
g
e-to
o
l docum
e
ntat
i
o
n
: d
e
scribe custom command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Baile
y
git-mer
g
etool documen
t
aiton: show t
o
ol
n
ames in
t
y
p
ewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Bailey
Add a
v
ery basic test sc
r
ipt for
g
it mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
a
i
l
ey
Tea
c
h git me
r
g
e
tool to
use custo
m
commands define
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harle
s
B
a
iley
Change
d
an interna
l
variab
l
e of mergetool to supp
o
rt
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bai
l
e
y
T
i
dy up gi
t
mergeto
o
l's backup file
behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Ch
a
rl
e
s Bailey
gitk: Fix the Makefile to cope wi
t
h sy
s
tems lackin
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charl
e
s Bailey
Remo
v
e
o
l
d generated fil
e
s from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charl
e
s Bailey
Fix g
i
t-instaw
e
b breakage
o
n
M
ac
O
S
X due to the l
i
mite
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fix clone not to ignore d
e
pth whe
n
performing
a
local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree