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
clone: do not use port number as dir name
2015-06-25
Charl
e
s Bai
l
ey
Fix
d
efi
n
it
i
o
n
of
AR
R
AY_SIZE for n
o
n-gcc builds
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charl
e
s Bailey
d
iffto
o
l: don't ass
u
me that default sh
is san
e
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bail
e
y
mergetool: don't
r
equire a work tree for -
-
tool-hel
p
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
Charles Bailey
Fix
c
ontrib/su
b
tree Makefile
to pa
t
ch #! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles
B
ailey
filter-branch: eliminate du
p
licate mapped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Bail
e
y
compa
t
/bswap
.
h: detect endianness on more
p
latforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
h
a
rles Bai
l
ey
t
e
sts:
don't re
l
y on strerror text when testi
n
g r
m
dir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
h
a
rle
s
B
a
i
ley
di
r
.
c: m
a
k
e
git_f
n
match() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bailey
mergetool: Remove
e
xplic
i
t reference
s
to
/
dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
C
h
arle
s
B
ailey
sta
s
h tests: stash can l
o
se data in a
f
i
le
r
emov
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Ch
a
rles
B
aile
y
s
t
a
sh: Do
n
't overwrite files tha
t
have gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bail
e
y
D
ocumen
t
ation: Describe ot
h
e
r
situations where -z af
f
ect
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles
Ba
i
ley
Chang
e
xdl_
m
erge to generate out
p
ut e
v
en
for null mer
g
es
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Ba
i
ley
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 Bail
e
y
m
ergetool: fix
ru
n
ning mergetool in
s
u
b
-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
merge
t
ool: Add a test for running
mergetool in
a
s
ub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Cha
r
les
B
ailey
me
r
getool: res
p
ect a
u
to
c
rlf by usi
n
g checko
u
t-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles
Bailey
mergetool: Don't keep tem
p
ora
r
y merg
e
files u
n
less
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Baile
y
m
e
r
getool: Add prompt
t
o continue after failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Ch
a
rl
e
s Bailey
Add -y/--no-prompt option to mergetoo
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
arles Bailey
Fi
x
s
o
me tab/space
in
c
o
n
sis
t
encies in git-m
e
rgetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charl
e
s
Bai
l
ey
git-ar
c
hiv
e
:
work
i
n bar
e
repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
M
a
ke git arch
i
ve res
p
ec
t
core
.
a
u
tocrlf w
h
en c
r
eating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
r
l
es Ba
i
ley
A
d
d ne
w
test to demonstr
a
te git
arc
h
i
v
e core
.
au
t
o
c
rlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charle
s
Bailey
merge-too
l
docume
n
tation: describe c
u
s
tom comm
a
n
d
usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rles Ba
i
ley
git-mergetool documentaiton
:
show toolnam
e
s
in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
ailey
A
dd a very b
a
s
i
c test scri
p
t for
g
it
mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
r
le
s
Bailey
Teach git mergetool
to use custom comma
n
d
s
d
efine
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Chang
e
d an internal variable o
f
mergetool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tidy up
g
it mergetool's backup file beha
v
iour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles
B
ailey
gitk: Fix the Makefil
e
to
cope with systems
lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
h
arles Bail
e
y
Remove
old
g
enerat
e
d files from
.
g
i
tig
n
ore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Char
l
es Bailey
Fix git
-
in
s
t
aweb breakage on
M
acOS X due to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fix c
l
one not t
o
ign
o
r
e de
p
th when performing a l
o
cal
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree