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
create_default_files(): don't set u+x bit on $GIT_DIR/config
2014-07-01
Charles Bail
e
y
filter
-
branch: e
l
i
minate
d
up
l
icate mapped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Bail
e
y
compa
t
/bs
w
ap
.
h: detect endianness
o
n more
platf
o
rms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
harles B
a
iley
t
ests:
d
on't
rely on
s
t
rerror t
e
xt when testing
r
mdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
dir
.
c:
make git_fn
m
at
c
h() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Ch
a
rles Bailey
mergetool: Re
m
ov
e
expl
i
c
it refer
e
nces to /
d
e
v
/tt
y
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Ch
a
rles Bailey
sta
s
h tests: s
t
ash c
a
n lose da
t
a in a file re
m
o
ved
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charle
s
Bailey
s
t
a
s
h: Don't ov
e
rwrite files that
have g
o
ne fr
o
m the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles
B
a
i
ley
Documentation: Describe
o
ther situations where -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
Change xdl_merge to gene
r
ate o
u
tput eve
n
for null
me
r
ges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
arles Baile
y
t
6
023:
m
erg
e
-file f
a
ils to outpu
t
any
t
hing for a de
g
e
n
erate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Ch
a
rle
s
B
a
iley
merg
e
tool:
f
ix running
m
e
rgeto
o
l in sub-di
r
ecto
r
ies
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bai
l
e
y
mergetool
:
A
dd a test for running mergetoo
l
i
n
a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
C
h
arles Bailey
merge
t
o
o
l
:
r
es
p
ect
autocrlf by
u
si
n
g c
h
ecko
u
t-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
m
e
rgetool: Don't
kee
p
temporary m
e
rge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles
B
ailey
mergetool: Add
prompt t
o
con
t
inu
e
after failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Cha
r
l
es Bailey
Add
-y/-
-
n
o
-p
r
o
mpt op
t
ion t
o
mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charle
s
Bailey
Fix so
m
e
tab/sp
a
ce
i
nconsistencies in g
i
t-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bail
e
y
g
i
t
-arch
i
ve:
work in
b
are repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
h
arles B
a
iley
Make
git archive
re
s
p
ect co
r
e
.
autocr
l
f
when cre
a
tin
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles B
a
iley
Add
new tes
t
to demonstrate
g
it arc
h
ive core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Char
l
es Bailey
merge-tool
d
ocumentat
i
on: descr
i
be custom co
m
mand usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
arles Bai
l
ey
git-m
e
rgetoo
l
documentaiton: show t
o
olnames in t
y
pewr
i
ter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add a
very basic test script for git merg
e
tool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Bailey
T
e
a
ch git mergetoo
l
to us
e
custom command
s
defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Ba
i
ley
Ch
a
nged an int
e
rnal variable of mergetool
t
o support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
T
i
dy up git mergetool's
b
ackup file be
h
av
i
o
ur
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
C
h
arles Ba
i
ley
gitk: Fix the Makefile t
o
cope with sys
t
e
ms lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
harles Bailey
Rem
o
ve old
g
enerated fi
l
es from
.
g
itignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
Fix
g
it-i
n
staweb breakag
e
o
n M
a
cOS
X
due to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Ba
i
ley
Fix clone not to ignore depth when performing
a loc
a
l
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree