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
Merge branch 'mr/msvc-link-with-invalidcontinue'
2014-03-31
Charl
e
s Bailey
tests: d
o
n
't rely on strerror
t
e
xt
when t
e
sting rmdi
r
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Cha
r
les Bailey
dir
.
c:
m
ake git_fnm
a
t
c
h
(
)
n
ot
i
n
l
ine
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Cha
r
l
e
s Baile
y
mergetoo
l
: Remove explicit references t
o
/dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
C
h
arl
e
s Bailey
st
a
sh t
e
sts: stash can lose data in a fi
l
e remo
v
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles
B
ailey
stas
h
: Don't ove
r
write files that have gone
from th
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Ba
i
ley
Docume
n
t
a
tion:
De
s
crib
e
other
s
itua
t
ions where -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Char
l
e
s Bai
l
ey
Change xdl_me
r
ge to generate output even
f
or n
u
ll merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
harles Bailey
t6023: merge-file
f
a
ils to output
a
nything for a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
me
r
getool: fix r
u
n
n
ing mergetool
in sub-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles
B
aile
y
merget
o
ol: Add a test for running mergetool
in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Ba
i
ley
mergetool: respect autoc
r
lf by usin
g
checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetool: Don't keep tempora
r
y
merge fi
l
es unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
a
r
les
B
a
iley
merge
t
ool:
A
dd
p
rompt to con
t
inue after failing
to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Add -y/--no-prom
p
t
o
ption to merg
e
tool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
arles B
a
i
l
ey
F
i
x some tab/space
inconsistencies in git-
m
er
g
eto
o
l
.
s
h
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles
B
ailey
git-ar
c
hive: wo
r
k
in
bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make
g
i
t
archive
res
p
ect core
.
autocrlf
when
creat
i
ng
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
harles B
a
iley
Add new
test to demonstra
t
e g
i
t archive core
.
a
u
t
o
crlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rles Bailey
merge-too
l
docume
n
t
a
tion: describe cus
t
o
m
c
om
m
and u
s
a
g
e
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
ha
r
les Baile
y
git-me
r
getool docume
n
taiton: show toolname
s
in
typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add
a
v
e
ry basic test script for git mer
g
etool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Teach git merg
e
tool t
o
use cu
s
t
om commands d
e
fined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Changed an inte
r
na
l
va
r
iable
o
f mergetool to
support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les Ba
i
l
e
y
Tidy up git mergetool
'
s backup
f
ile
behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Cha
r
les Bailey
gitk:
F
ix the Makefile
to co
p
e with systems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles
Bailey
Rem
o
ve ol
d
g
e
nerated files fr
o
m
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Ba
i
ley
F
i
x git-instaweb
b
r
e
a
kage
o
n MacOS X due to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles
B
ailey
Fix clone n
o
t
to
ign
o
re depth when performing a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree