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
Merge branch 'sk/mingw-uni-fix-more'
2014-07-21
C
har
l
es
B
ailey
F
i
x
c
ont
r
ib/subtree
Makefil
e
t
o
patch #! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles Bailey
filt
e
r-branch
:
el
i
minate
d
uplic
a
te
mapped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
C
harle
s
Baile
y
c
o
mpat/bswap
.
h: detect
e
ndianness on more platfo
r
ms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
harle
s
Bail
e
y
t
e
sts: don't re
l
y
o
n strerror tex
t
when
testing rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Char
l
es Ba
i
ley
dir
.
c: make gi
t
_
f
nma
t
ch(
)
not
i
nline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Cha
r
les Ba
i
ley
mergetool: R
e
mo
v
e explicit refer
e
nces to
/d
e
v/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Ch
a
rle
s
B
a
iley
s
tas
h
tests: stash can
lose data in a file re
m
ove
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
h
a
r
l
es Bailey
stash: Don't overwrite
f
iles
that have go
n
e from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charl
e
s Bail
e
y
Documen
t
a
tion: Describe other situations whe
r
e -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
Change
xdl_merge
t
o gen
e
rat
e
outp
u
t
e
ven
for
n
ull merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Char
l
es
Bailey
t6023: merge
-
file
fails to output anything for a
d
egenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
merget
o
ol: fix
r
unning
me
r
getool in su
b
-
d
irectories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
arl
e
s Baile
y
merget
o
ol:
Add a tes
t
for
running merge
t
ool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Char
l
e
s Bailey
me
r
get
o
ol: resp
e
ct autocrl
f
by using ch
e
ckout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Char
l
es B
a
il
e
y
mergetool: Don't k
e
ep
temporary
merge fi
l
es unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetool:
A
d
d
prompt to con
t
inue after
failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Cha
r
les Bailey
Ad
d
-y/-
-
no-promp
t
opti
o
n
to merge
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fix s
o
m
e ta
b
/spa
c
e i
n
consi
s
tencies in g
i
t-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charl
e
s Baile
y
git-archi
v
e:
w
o
rk
in bare repo
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
harles Bailey
Make git archive respect co
r
e
.
autocrlf
when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charl
e
s
B
ai
l
ey
Add new
tes
t
to demonstrate git ar
c
hive core
.
autocrl
f
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
r
l
e
s Bai
l
ey
merge-to
o
l documentatio
n
:
describe
c
ustom
command
u
sage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
arles
Bailey
git-me
r
g
e
tool documentai
t
on
:
s
h
ow tooln
a
m
es in ty
p
ewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les
B
ailey
Add a very basic tes
t
s
cr
i
pt
for git mer
g
etoo
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bail
e
y
Te
a
ch git mergeto
o
l
to use custom commands
define
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Bailey
Change
d
an internal va
r
iabl
e
of mergetool t
o
support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
a
r
le
s
Bailey
Tidy up git mergetool'
s
b
ackup file behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
git
k
: Fix
t
h
e
Makefile to cope wi
t
h s
y
s
tems
lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
harles
B
a
i
le
y
R
e
mov
e
old g
e
nerated f
i
les from
.
git
i
gnore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charle
s
Bailey
Fix
git-in
s
taweb
b
re
a
kage on MacOS X due to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fi
x
clone
not to ignore dept
h
when performi
n
g
a
local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree