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 'jc/prompt-document-ps1-state-separator'
2015-06-25
C
h
ar
l
es Ba
i
ley
Fi
x
definit
i
o
n of ARRAY_SIZE for
non-gcc
b
u
ild
s
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles Baile
y
difftool: don't assume th
a
t default sh is sa
n
e
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charle
s
Ba
i
ley
mergetoo
l
:
d
on't require a work t
r
e
e
for --tool-he
l
p
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
C
h
arles Bailey
Fix
contrib
/
subtree
Makefile to patch #! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles Bailey
fi
l
ter-branch:
elimi
n
ate d
u
plicate
m
apped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles
B
a
iley
compat/bswap
.
h: dete
c
t endia
n
ness
on
m
ore platf
o
rms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charl
e
s Bailey
tests: don't r
e
ly on
s
trerror
text whe
n
testing
r
mdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Char
l
es Bailey
d
ir
.
c:
m
ake git_fnmat
c
h() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bailey
merget
o
ol: Rem
o
ve explicit references to /de
v
/tt
y
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charl
e
s Bail
e
y
stash te
s
ts: stas
h
can lose data
in a file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles B
a
i
ley
s
t
ash: Do
n
't overwrite files th
a
t have
go
n
e from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
Documen
t
ation:
D
e
s
c
r
i
be other s
i
tuations where -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
harl
e
s
Bai
l
ey
Change xdl_mer
g
e to generat
e
output
e
ven for null
m
er
g
es
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t6023:
merg
e
-file fails to output anythi
n
g
f
or a dege
n
erate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charl
e
s Bailey
mergetool:
fix running merget
o
ol
i
n
s
ub-direc
t
ories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Cha
r
les
Ba
i
l
ey
mergetool: Add a
t
es
t
for runni
n
g mergetoo
l
in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Cha
r
les Bailey
merge
t
ool: respect autocrlf
by us
i
ng
c
hec
k
o
u
t-i
n
dex
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
m
erg
e
tool: Don't
keep tempora
r
y merge
files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bail
e
y
mergeto
o
l: Add prompt to c
o
ntinue after failing
to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charl
e
s Bai
l
e
y
A
d
d
-y/-
-
no-prompt option t
o
mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles B
a
iley
Fix some tab/space incon
s
istencie
s
i
n git-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
C
h
a
r
l
es Bailey
git-archive:
work in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charle
s
B
ailey
Make gi
t
archiv
e
respect
c
ore
.
autocr
l
f
w
hen creati
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles
Bailey
A
d
d new
t
est to demonstrate git archive core
.
a
ut
o
crlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Ba
i
ley
mer
g
e-tool
docum
e
ntation:
descri
b
e custom comm
a
nd usag
e
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
arles Bailey
git-merg
e
t
o
o
l
doc
u
mentaiton: sho
w
to
o
lnames in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s B
a
iley
Add a very ba
s
ic test script for git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
T
ea
c
h git merge
t
o
ol to use custom co
m
mand
s
defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bailey
C
hang
e
d
an internal varia
b
l
e
of mergetool to suppo
r
t
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Ba
i
ley
Tidy up git mergetool'
s
ba
c
kup file behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles B
a
iley
g
i
t
k
: Fix the
Makef
i
l
e
to c
o
pe wit
h
sys
t
e
m
s lac
k
ing
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Cha
r
les
Bailey
Remove ol
d
ge
n
e
r
ated file
s
from
.
giti
g
nore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
harles Bai
l
ey
F
ix git-ins
t
aweb breakage on MacO
S
X due to th
e
l
i
mi
t
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bail
e
y
Fix
c
l
one n
o
t t
o
ignore dep
t
h
when performing
a
local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree