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
wt-status: move #include "pathspec.h" to the header
2015-06-25
Charl
e
s Bailey
Fix
def
i
nition of AR
R
A
Y
_
S
IZE
f
or non-gcc
bu
i
l
d
s
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Cha
r
les
B
a
iley
dif
f
tool: don't assu
m
e
that default
sh is
sane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
C
harles Bailey
mergeto
o
l
: don't require a work tre
e
for -
-
tool-help
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
Charles Bailey
Fix contrib/subtree Makefile to patch #! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles Bailey
f
i
l
t
er-branc
h
: eliminate duplica
t
e
m
appe
d
pare
n
t
s
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Bailey
compat/b
s
w
a
p
.
h: detect e
n
d
ia
n
ness on m
o
re plat
f
orms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Ch
a
rles
B
a
iley
tests: don
'
t rely on strerror text when testing rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
dir
.
c:
make git_fn
m
a
tch() not
i
nline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
C
harle
s
Bailey
mergetoo
l
: Remov
e
explicit ref
e
rences to /
d
ev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
C
harl
e
s B
a
iley
stash t
e
sts
:
s
tash
can
l
ose
d
ata in a
f
i
le removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bai
l
ey
st
a
sh: Don't overw
r
ite files that have g
o
ne from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
Doc
u
mentatio
n
: Des
c
ribe othe
r
situati
o
ns wher
e
-z affec
t
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Ch
a
rles
B
ailey
Change xdl_merge to
g
enerate outpu
t
even for null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
harles Bailey
t602
3
: merge-file
fails to
output anything
f
or
a degener
a
t
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Char
l
es Bailey
mergetool: fix runn
i
n
g m
e
rgetool in sub-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
arl
e
s
Ba
i
ley
mergetool: Ad
d
a te
s
t
for r
u
nning mergetool in a
s
u
b
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Ch
a
rles Bailey
mer
g
etool: respect aut
o
cr
l
f
by
u
sing checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Cha
r
l
es Bailey
mergetool: D
o
n't kee
p
te
m
porary merge
f
iles
u
nless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles
Bailey
mer
g
etool: Add pro
m
pt to continue afte
r
f
a
i
l
ing t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Ad
d
-
y
/--no-prom
p
t option to
m
ergeto
o
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Ba
i
l
e
y
Fix some tab/s
p
ac
e
inconsis
t
enc
i
es
i
n
git-merge
t
ool
.
s
h
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Ba
i
ley
git-
a
rchive: work in
b
a
re repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles
B
ail
e
y
Make git archive
respe
c
t co
r
e
.
auto
c
rlf w
h
en creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
h
a
r
les Bailey
Add
new te
s
t to demonstrate git archiv
e
c
ore
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
merge-tool documentation: describe custom
c
ommand usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
g
i
t-mergeto
o
l documentai
t
on: show
t
oolna
m
es in typew
r
iter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Ba
i
ley
A
d
d
a v
e
ry basic te
s
t scrip
t
f
or git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Bailey
Teach git mergetool to use
c
ustom
c
omman
d
s defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Cha
n
ged an internal var
i
a
ble of
mer
g
etool to supp
o
rt
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tidy up gi
t
mergeto
o
l's backup file behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
g
i
tk:
F
ix the Makefile to cope
with systems lac
k
ing
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
Remove old
generated files from
.
giti
g
n
ore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Cha
r
l
e
s Bai
l
ey
Fix git-inst
a
web 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
clone not to ig
n
ore
d
epth
wh
e
n
p
erforming a lo
c
a
l
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree