repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
2014-07-01
Charl
e
s
Bailey
filter-branch:
e
limina
t
e
d
up
l
ica
t
e
mapped p
a
rents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charl
e
s
Bailey
c
o
m
p
at/bswap
.
h: de
t
ect
e
ndianness
on more platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Cha
r
les Bailey
test
s
: don't r
e
ly
o
n strer
r
o
r
text
when
te
s
t
i
ng rmd
i
r
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Ch
a
r
le
s
Bai
l
ey
d
i
r
.
c: make
g
it_
f
n
matc
h
(
)
n
ot
inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Ch
a
r
les Bailey
mergetool: Remo
v
e explici
t
r
e
ference
s
to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Bai
l
ey
stash tests: s
t
ash can lose dat
a
i
n
a
f
ile removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Ch
a
rles
B
ailey
stash: Don't ove
r
w
rite files th
a
t hav
e
gone
f
ro
m
the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Char
l
e
s
Bail
e
y
D
o
c
umentation: De
s
cribe ot
h
er
s
i
t
uation
s
where -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles
B
ailey
Change xdl_merge to generate outp
u
t even for
n
ull merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Cha
r
l
es
B
ailey
t602
3
:
merge-fi
l
e fails to o
u
tput
a
n
ythi
n
g
for a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles
Bailey
me
r
getool: fix runn
i
ng mergetool in sub-dire
c
tor
i
e
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
mergetool: Add a tes
t
f
or r
u
nning
m
ergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
m
erg
e
tool: respe
c
t a
u
tocr
l
f
by usin
g
checkout-i
n
dex
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Ba
i
ley
mer
g
etool: Do
n
't ke
e
p tempo
r
ary merge files unles
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Char
l
es Ba
i
ley
merge
t
ool: Add prompt
to
co
n
t
inue after failing
t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bai
l
ey
Add -y/
-
-no-pro
m
pt option
t
o
m
erg
e
t
o
ol
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Cha
r
les Bai
l
ey
Fix some tab/space
inconsisten
c
ies in
g
it-merge
t
o
o
l
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
git-archive:
w
o
rk i
n
bare
r
epos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
h
a
rles Bailey
Ma
k
e g
i
t
a
rchive
r
espect cor
e
.
auto
c
rlf
when
c
r
eating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Ba
i
ley
Add new test to demo
n
strate git archive co
r
e
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rl
e
s Bailey
merge-tool doc
u
men
t
a
tion: describe custom command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
git-mergetool
document
a
iton
:
show toolnames in typ
e
writer
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bailey
Add a
v
e
r
y basic test script for git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Bailey
Teach git merg
e
to
o
l to use custom commands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
e
s
Bai
l
ey
Changed an internal v
a
riable of
mergetool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles Ba
i
l
ey
Tidy up
g
it merget
o
ol
'
s backup file behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bai
l
ey
git
k
:
F
ix the Makefile to cope
with systems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
R
e
move o
l
d generate
d
files fr
o
m
.
gi
t
i
g
n
ore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
h
arles
Ba
i
ley
Fix
git-ins
t
aweb
b
r
e
a
k
a
ge on M
a
cOS X due to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
h
arles Bailey
Fix
c
l
o
n
e not to
ignore depth when
p
e
rforming a l
o
c
al
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree