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
alloc: write out allocator definitions
2014-07-01
Charles
B
ai
l
ey
fi
l
ter-branch
:
el
i
minate duplicate mapped
parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Char
l
es Bailey
com
p
at/bswap
.
h
:
d
etect endianness on
mo
r
e platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
h
arles Bailey
tests: don't rely
on strerror
text when tes
t
ing rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
dir
.
c: m
a
k
e
g
it_fnm
a
tch() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Ch
a
rle
s
Bailey
mergetool:
R
emove explic
i
t
references
to
/
dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
C
h
arles Ba
i
l
ey
stash tests: stash can lose data in a file
removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
s
t
a
s
h:
D
on't o
v
erwrite fi
l
es
t
hat h
a
ve gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles
B
ailey
Documentation:
Describe o
t
her sit
u
at
i
ons
where -z
affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bai
l
ey
Change
xd
l
_merge to ge
n
era
t
e
o
u
tput
even for null merg
e
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t60
2
3: merge-fil
e
fa
i
ls to outp
u
t
anything for
a de
g
ener
a
te
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles
B
ai
l
ey
mergetool: fix running mergetool
in sub-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
harles Bailey
mergetool: Ad
d
a test
f
or r
u
n
nin
g
mergetool
i
n a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
C
harles Bailey
mergetool: respect autocrlf by
using check
o
ut-
i
n
dex
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
merge
t
o
ol:
Don't kee
p
temporary merge file
s
unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetool: Add prompt to continu
e
after failing
t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles B
a
ile
y
Ad
d
-y/-
-
no
-
prompt
option to mergeto
o
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charl
e
s Bailey
Fix
s
ome t
a
b/space
inc
o
nsistencies
in git-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
C
harles
B
a
iley
gi
t
-a
r
c
h
i
v
e
: w
o
rk i
n
bare repo
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charle
s
Ba
i
ley
Make
git
a
rch
i
ve respe
c
t
c
ore
.
autocrlf
w
hen cre
a
tin
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles
B
aile
y
Ad
d
ne
w
tes
t
to demonstrate gi
t
arc
h
ive core
.
a
utocrl
f
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
merg
e
-tool d
o
cument
a
tion: describe custom command usa
g
e
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
har
l
e
s
B
ailey
git-
m
ergeto
o
l do
c
u
m
ent
a
iton: show to
o
lnames
i
n typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Bailey
Ad
d
a very basic test
s
cript
f
or git mer
g
e
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
iley
Teach
g
i
t
m
erget
o
ol to use
c
ustom comman
d
s
defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
C
h
anged an
interna
l
varia
b
le of me
r
get
o
ol to su
p
port
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
har
l
es
B
aile
y
Tidy
up
g
i
t mergetool's backup file behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Baile
y
gitk: Fix the Makefile to cope with sys
t
ems lacki
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
h
arles Bailey
Remove old g
e
ner
a
t
e
d
files
f
r
o
m
.
g
i
tignor
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charl
e
s Baile
y
Fix
g
it
-
instaweb b
r
eakage on MacOS X due to the
l
imited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
harle
s
Bailey
Fi
x
clone not to ignore depth
w
hen performi
n
g
a
l
o
cal
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree