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 'ah/fix-http-push'
2014-07-01
Charles Baile
y
filter-branch: eliminate
duplicate mapped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles
Bailey
compat/b
s
wap
.
h: de
t
e
ct
endianness on m
o
r
e p
l
at
f
orms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
t
e
sts: don't rely on
s
t
rerror tex
t
when testing rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Ch
a
rl
e
s B
a
iley
di
r
.
c:
m
ake
g
i
t
_fnmat
c
h() n
o
t
inl
i
ne
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
C
ha
r
l
e
s Bailey
mergeto
o
l: Remove ex
p
licit
r
eferences to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Bailey
stas
h
t
ests: sta
s
h can lose data i
n
a file
removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles
B
ailey
stash: Don't overw
r
ite files that have g
o
ne fr
o
m the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Cha
r
les
B
ailey
Docume
n
t
ation:
De
s
cribe othe
r
situations where -z
a
ffe
c
ts
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles B
a
iley
Cha
n
ge xdl_merge
to generate
output even for null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles
Ba
i
ley
t6023: mer
g
e-fil
e
fails to output
a
nythin
g
f
or a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Ch
a
r
l
es Bai
l
ey
mergeto
o
l: fix
r
unning mergetool in su
b
-d
i
rectorie
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Ch
a
r
les Bailey
me
r
getool: Add a tes
t
for ru
n
n
ing mergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charle
s
Ba
i
l
e
y
mergetool: respe
c
t autocrlf b
y
using checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles B
a
iley
mergetool:
D
on
'
t keep temporary merge
files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
harles Bai
l
ey
merg
e
to
o
l: Add pr
o
m
pt to
c
ontinue after failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
A
d
d
-y/--no-pro
m
p
t o
p
tion t
o
merge
t
o
ol
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fix s
o
me t
a
b
/spac
e
i
nconsist
e
nc
i
es in
g
it-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
git-archive:
w
ork in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles B
a
iley
Make g
i
t archive respect core
.
autocr
l
f
w
h
en c
r
eat
i
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Add
n
ew test to demo
n
strate git a
r
chive
cor
e
.
a
u
tocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Cha
r
l
es Bailey
merge-tool do
c
um
e
ntat
i
o
n
: describe custom command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles
B
ailey
git-merge
t
ool documentaiton
:
show toolna
m
es in
t
ypewr
i
ter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
ailey
A
dd a very
b
asic test s
c
r
ipt fo
r
git
merge
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rle
s
Baile
y
Teach git mergetoo
l
to use custo
m
commands d
e
fined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
C
h
a
nge
d
an i
n
t
e
rna
l
v
a
r
i
a
b
l
e
o
f
mergetool to su
p
po
r
t
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles Baile
y
T
i
d
y
up git mergetool's ba
c
kup fi
l
e beh
a
viour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Char
l
es B
a
iley
git
k
:
Fix the
M
akefile to cope with
s
yst
e
m
s
l
a
cking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
Remove old gen
e
rated
f
ile
s
from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles B
a
iley
Fix git-i
n
stawe
b
breakag
e
on M
a
cOS X du
e
to t
h
e limi
t
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Char
l
es
Bailey
F
ix clone not to ignor
e
depth when perf
o
rming a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree