repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
receive-pack: GPG-validate push certificates
2014-07-21
Ch
a
rles Bailey
Fix contr
i
b
/s
u
btree Mak
e
file
to patc
h
#! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
C
harles B
a
i
ley
f
il
t
er-branch: el
i
minate duplicate
map
p
ed pare
n
ts
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Bailey
compat
/
b
s
wap
.
h: detec
t
endianness
o
n more p
l
at
f
o
rms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Char
l
es Bailey
tes
t
s: d
o
n't rely on strer
r
or tex
t
when testing
rmd
i
r
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles
Bailey
dir
.
c: make
g
it_fnmatch() no
t
in
l
ine
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bai
l
ey
mergetool: Remove
e
xpli
c
it referen
c
es to /dev
/
t
t
y
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
C
h
a
r
les Bailey
stash test
s
: stash can lose data in a
file rem
o
ved
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
h
a
r
les B
a
ile
y
st
a
sh: Don't o
v
e
r
write files that have gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Baile
y
Documentation: Desc
r
i
b
e other s
i
tuatio
n
s wh
e
r
e -z
a
ffects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles
Bailey
Change xdl_m
e
rge
t
o gene
r
a
te o
u
tput eve
n
fo
r
null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Cha
r
le
s
Bailey
t60
2
3: me
r
ge-
f
ile fails to
o
utput anyth
i
ng for a
d
egene
r
ate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Char
l
e
s
Bail
e
y
me
r
getool: fix run
n
in
g
mer
g
etool in sub-d
i
r
e
ctories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bail
e
y
merg
e
tool: Ad
d
a t
e
st for running mer
g
etool
i
n a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Cha
r
les
Bailey
merg
e
tool: respe
c
t aut
o
c
rlf by using check
o
ut
-
index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
me
r
ge
t
oo
l
: Don't
k
e
ep temporary merg
e
fi
l
es unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charl
e
s Ba
i
ley
m
e
r
g
etool: Add prompt
to contin
u
e
after failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
a
r
l
e
s Bail
e
y
A
d
d -y/
-
-no-prom
p
t o
p
tio
n
to
merge
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
har
l
es Ba
i
ley
Fix s
o
m
e
tab/
s
pace inconsis
t
encies i
n
git-merge
t
ool
.
s
h
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles
B
ailey
g
i
t-archive: work in b
a
re repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charl
e
s Bailey
M
a
k
e git archive respect c
o
re
.
autocrlf when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Cha
r
les Bailey
Ad
d
new test to demonst
r
ate git
a
r
c
hi
v
e cor
e
.
autocr
l
f
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
a
rles Ba
i
l
ey
merge-tool
d
ocumentat
i
on: des
c
ribe cust
o
m c
o
m
mand
u
sag
e
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
ha
r
le
s
Ba
i
l
ey
git-mer
g
et
o
ol
d
oc
u
mentaiton: show toolnames
i
n typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Bailey
Add a ver
y
basi
c
t
e
s
t
s
cript
for
gi
t
mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rle
s
Bailey
Tea
c
h
g
it mergeto
o
l to use
c
ustom commands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s Bailey
Changed an internal var
i
abl
e
of
m
e
r
getool
t
o
suppor
t
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
ailey
Tidy up
git mergetool'
s
backup fi
l
e
behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Char
l
es Bail
e
y
gitk: Fix the Mak
e
file to cope
w
it
h
systems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charl
e
s Ba
i
ley
Remove o
l
d gene
r
ated fil
e
s from
.
g
i
tignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
F
i
x gi
t
-in
s
taw
e
b breaka
g
e on Ma
c
O
S
X due to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Cha
r
l
e
s
Bai
l
ey
Fi
x
clone no
t
to ignore dep
t
h when performing a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree