repo.or.cz
/
git
/
mingw
/
4msysgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Revert "Merge branch 'dt/refs-check-refname-component-sse-fix'"
2014-07-21
Cha
r
les Bailey
Fix contrib/
s
ubt
r
ee Makefile to patch #! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
C
h
a
rles Bai
l
ey
f
ilter-branc
h
: eliminate duplicate m
a
pped
paren
t
s
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Ch
a
rles Ba
i
ley
c
o
mpat/bswap
.
h: detect
e
ndian
n
ess o
n
more platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
harles Bailey
t
e
sts: don
'
t rely on strerror text when testin
g
rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Char
l
es Bai
l
ey
d
i
r
.
c
:
m
ake
gi
t
_
fnm
a
tc
h
(
)
not inl
i
ne
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles B
a
iley
merget
o
o
l: Remov
e
e
xplicit references to /dev/t
t
y
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Ba
i
ley
st
a
sh tests: stash ca
n
l
o
se data in
a file remov
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles B
a
i
l
ey
s
tas
h
: Don't ov
e
rw
r
ite fi
l
e
s
that hav
e
g
one from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Ba
i
ley
Doc
u
mentation: Describe other situations where -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Ch
a
rles Bailey
Change xdl_
m
e
rge to gener
a
te output even for
n
u
l
l merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charl
e
s Bailey
t602
3
: m
e
rge-f
i
l
e fails to
o
utput anything f
o
r
a
deg
e
ne
r
a
t
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Ba
i
l
e
y
mergetool: fix run
n
ing
m
ergetool in sub-d
i
rectories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charl
e
s Bailey
merget
o
o
l
:
A
d
d
a test for
runnin
g
mer
g
et
o
ol
i
n
a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
C
h
arles
B
ai
l
ey
m
ergetool:
r
espe
c
t
a
utocrlf by using che
c
kout-inde
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Cha
r
les
Bailey
m
e
r
getool: Don't
keep temporary me
r
g
e
f
iles unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetoo
l
:
A
d
d prompt
t
o
conti
n
ue afte
r
failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles
Bail
e
y
Ad
d
-
y
/
--no-prompt option to merg
e
to
o
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fix some tab/space inconsistenc
i
es
in git-merg
e
t
o
ol
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
C
h
ar
l
es
B
ailey
g
it
-
archive: work in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make git
a
rchive respect core
.
autocrlf when
cr
e
ating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bail
e
y
Add new test to demons
t
r
a
te git archive core
.
au
t
ocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Char
l
es Bailey
merge-tool doc
u
m
e
ntation: describe
custom comman
d
u
sage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
g
i
t-mergeto
o
l documen
t
aiton: show too
l
names in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add a
very basic test s
c
ri
p
t
for
g
it me
r
ge
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bail
e
y
Teach git mer
g
et
o
o
l to
u
se
custom comma
n
ds defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
le
s
Bailey
Changed an internal variable of merg
e
tool to
s
up
p
o
r
t
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harl
e
s Bailey
Tid
y
up git merge
t
ool's b
a
ckup
f
ile behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Ch
a
rles B
a
i
l
ey
git
k
: Fix the Ma
k
efile to cope wi
t
h systems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
Remov
e
old generated files from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles
B
ailey
Fix git-instaweb
b
reakage on MacOS X du
e
to t
h
e limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fix
c
l
o
n
e
not
t
o ignore depth
w
hen performi
n
g a lo
c
al
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree