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 'jk/alloc-commit-id-maint' into maint
2014-07-01
Charles Ba
i
ley
f
i
lt
e
r-branch: eliminate duplicate mapp
e
d parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charl
e
s Bailey
c
o
mpat/bswap
.
h: detect endian
n
ess
o
n
m
o
re
pl
a
tforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
harles Bailey
tests: don't rel
y
on strerror tex
t
when testing rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charle
s
Bailey
dir
.
c
: make git_fnmatch() not inlin
e
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles B
a
i
l
ey
mergetool: Remove e
x
plici
t
refer
e
nces
t
o
/dev/tt
y
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles
Bai
l
e
y
stash tests: st
a
sh can lose da
t
a in a
file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Ch
a
rles
Bailey
stash:
D
on'
t
overwrite files
t
hat
h
ave gone from th
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charle
s
Bailey
Docum
e
n
t
a
tion: Describe other situations where -z af
f
ects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
Change xdl_
m
erge
t
o
gene
r
ate ou
t
p
ut even for null
m
erges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Baile
y
t6023:
m
e
r
g
e-file f
a
ils to output anythi
n
g for a de
g
enerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles
Bailey
mer
g
e
t
ool:
f
i
x
running merget
o
ol in sub-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
arl
e
s Bail
e
y
me
r
getool:
A
d
d a test for running
m
ergetoo
l
in a
s
ub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles
B
ailey
mergetool: respect autocrlf by
u
s
ing checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
harles Bailey
mergetoo
l
: Don't keep tempora
r
y m
e
rge fil
e
s
unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Ch
a
rles Bailey
m
e
r
g
etool:
A
d
d p
r
ompt to cont
i
nue after faili
n
g to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
A
d
d -y
/
--no-p
r
ompt
option to
m
erg
e
too
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Ba
i
l
e
y
Fix some
t
ab/
s
pa
c
e
inconsistencies
i
n git-mer
g
etoo
l
.
s
h
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charl
e
s Bailey
git-archive: work
in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
rle
s
Ba
i
ley
Make
git archive respe
c
t
c
o
r
e
.
a
utocr
l
f when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charl
e
s Bailey
A
d
d new t
e
st to d
e
mo
n
strate git
archive
core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
harles
Bailey
merge-t
o
ol
do
c
u
mentation: des
c
r
ib
e
custom
c
o
mmand usa
g
e
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Char
l
es Bailey
g
i
t-m
e
r
getool doc
u
m
entaiton: show t
o
ol
n
a
mes
in typewr
i
ter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add a very basi
c
test s
c
ript f
o
r git merg
e
tool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
ar
l
es
Bailey
Teac
h
g
it mergetool to use custom co
m
mands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Changed
an i
n
ternal variable o
f
mergetoo
l
t
o
s
upport
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harle
s
Bailey
Tidy up git m
e
rgetool's backup f
i
le behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Ch
a
r
l
es B
a
il
e
y
gitk: Fix
t
h
e Makefile to cope
with systems
lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Char
l
es Bailey
Remove old generate
d
files from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Cha
r
l
e
s Bailey
Fix git-instaweb
breakage on Ma
c
OS X due to the li
m
ited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fix clo
n
e not to ignore
depth when perfo
r
mi
n
g a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree