repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
parse_color: drop COLOR_BACKGROUND macro
2014-07-21
Cha
r
les Bailey
F
i
x cont
r
ib/su
b
t
r
e
e
Ma
k
e
f
ile
t
o pat
c
h #! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles Ba
i
l
ey
filter-branch: eliminate duplicate mapped pa
r
ents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles B
a
il
e
y
comp
a
t/bswap
.
h: detect endi
a
nness on more
p
lat
f
orms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles B
a
iley
tests:
don't
r
ely on strerror text wh
e
n testing rm
d
ir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charl
e
s
B
a
i
ley
d
ir
.
c:
make git_fnmatch() not inl
i
ne
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Char
l
es Bail
e
y
mer
g
etoo
l
: Remove ex
p
licit refe
r
ences to /dev/tt
y
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
C
harles
B
ailey
stash
te
s
t
s
:
s
t
a
sh can lose dat
a
in
a
file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charl
e
s B
a
ile
y
s
ta
s
h: Do
n
't overwrite files
t
h
at
have gone from
the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Cha
r
les Ba
i
ley
Documentation: D
e
scribe ot
h
er
s
ituations where -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bai
l
ey
Cha
n
ge xdl_merge to
gener
a
t
e output even for n
u
ll me
r
ges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles
B
a
iley
t6023: merge-
f
ile fails to out
p
ut anything
for a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
arle
s
Bailey
merge
t
ool: fix runni
n
g mergetool
i
n su
b
-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Char
l
es Bailey
me
r
getool: Add a
test for runni
n
g mergetool in a s
u
b
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charle
s
Ba
i
l
e
y
m
e
rget
o
ol:
r
espect autocr
l
f by using check
o
ut
-
index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bai
l
e
y
mergetool: Don't
k
e
ep temporary merge fi
l
e
s unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bai
l
ey
merge
t
ool:
A
dd pr
o
mpt
t
o continue a
f
ter fai
l
ing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Add -y/-
-
no
-
prompt option
t
o mer
g
etool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles
B
ai
l
e
y
F
i
x some
t
a
b
/
s
pac
e
inconsistenc
i
es in
g
it-mergetoo
l
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
C
h
arles Bailey
gi
t
-arc
h
ive:
work in bar
e
repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
r
les Bailey
Mak
e
gi
t
archive respect core
.
autocrlf when cre
a
t
ing
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Add new
test
t
o demonstra
t
e git archive co
r
e
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles B
a
iley
merge-
t
ool docume
n
tation: desc
r
ibe custom com
m
a
n
d usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
git-me
r
geto
o
l documen
t
aiton: s
h
o
w toolnames i
n
t
y
pewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es B
a
iley
A
d
d a very
b
asic test script
f
o
r git merget
o
ol
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
iley
Teach git
mergetool
t
o use custom co
m
mands defin
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Bailey
Changed an in
t
e
r
nal
varia
b
le
o
f merget
o
ol to supp
o
rt
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
ile
y
Tidy up git mer
g
etoo
l
's
b
ac
k
up file b
e
ha
v
iour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Ba
i
ley
g
i
t
k:
Fix the Make
f
i
le
to cope with s
y
stems
l
ack
i
ng
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Char
l
es
B
a
i
ley
Remove o
l
d generat
e
d files from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bai
l
e
y
Fix git-
i
nstaweb breakage on MacOS X due to th
e
li
m
ited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Ch
a
rl
e
s Ba
i
ley
Fix c
l
one not to igno
r
e
depth when performing
a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree