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
Merge branch 'sg/completion-commit-cleanup' into maint
2015-06-25
Charles Bailey
Fix definition of ARRAY_
S
IZE
f
o
r non-gcc
builds
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles Baile
y
difftool: don't assume t
h
at defau
l
t sh
i
s s
a
ne
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Char
l
es Bailey
me
r
ge
t
ool:
don't
r
equ
i
re a work
tree for -
-
tool-he
l
p
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
Charles Bailey
Fix co
n
trib
/
subtre
e
M
a
kef
i
le to patch #! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Ch
a
r
l
es Bail
e
y
f
i
lter-branch: elimi
n
ate duplicate
mapped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Baile
y
compat/b
s
w
ap
.
h: detect endi
a
nness on more platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
h
arles Bailey
test
s
:
don
'
t rely on strerr
o
r
t
ext whe
n
testin
g
rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
d
i
r
.
c: mak
e
gi
t
_fnm
a
tch(
)
not
i
nl
i
ne
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bailey
mergetool: Remove explicit
r
efe
r
e
nces to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Ba
i
l
ey
st
a
sh test
s
: stash
c
a
n
lose d
a
ta
i
n a file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Char
l
es B
a
iley
stash
:
Do
n
'
t overwrite
f
iles
th
a
t
have gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bail
e
y
Documenta
t
ion: Describe other situations wh
e
r
e -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
harles Bailey
Change x
d
l
_merge to gen
e
r
a
te output even for null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
arles Bailey
t6023: merge-file fail
s
t
o output anything
for a
degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
mergetool:
fix runn
i
ng mergeto
o
l in sub-di
r
ectories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Char
l
e
s Bailey
me
r
getool: Add a tes
t
for running mergetool in
a s
u
b
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Ch
a
rl
e
s Bailey
mergetool:
r
espect autocrlf
by us
i
ng checkout-i
n
dex
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
ha
r
les
Bailey
mergetoo
l
: Don't keep temporary merge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bai
l
ey
mergetool: A
d
d p
r
o
m
pt to cont
i
nue after fail
i
ng to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles B
a
iley
Add -y/--no-prompt op
t
ion
to mer
g
et
o
ol
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
a
rl
e
s Bai
l
e
y
F
ix some tab/space in
c
onsist
e
ncies in git-
m
ergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles
Bailey
git-archive: work in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles
B
a
i
ley
Make git archive respect c
o
re
.
autocrlf when c
r
eati
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles
B
ailey
Add ne
w
t
e
st
t
o demonstrate
g
it archive core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
arles Bailey
m
e
rge-tool documentat
i
o
n:
d
e
scribe cus
t
om command u
s
a
ge
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charle
s
Ba
i
ley
gi
t
-mergetool d
o
cumentait
o
n: show toolnames in typew
r
iter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add a
very basic test script for git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Bailey
T
each g
i
t
m
e
rgetool to use custom
c
omman
d
s defin
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
C
h
anged an internal varia
b
le of
merget
o
ol to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
i
l
e
y
Tidy
u
p git mergetool's backup f
i
le beh
a
viour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
g
itk: Fix the Makefile to cope with s
y
stems la
c
king
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles
B
a
il
e
y
R
emove old g
e
nerated files from
.
git
i
gnore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Ba
i
l
e
y
Fix git-i
n
st
a
we
b
breakage on
MacOS X due to the
l
imi
t
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles
B
a
iley
Fix cl
o
ne
not to
i
gnore depth whe
n
performi
n
g
a
l
ocal
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree