repo.or.cz
/
git
/
mingw
/
4msysgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Windows: make sure that merge-octopus only outputs LF line endings
2014-04-16
Johanne
s
S
c
hin
d
eli
n
Wi
n
d
ow
s
: make sure that mer
g
e-oct
o
p
us o
n
ly outputs
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-11
Joh
a
nnes Schindelin
M
erg
e
'
w
in-
t
e
sts-
r
ebase'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-11
Joh
a
nnes Schindelin
fixup!
M
e
rge
'win-t
e
sts-
f
ixes
'
into HEAD
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-11
J
ohann
e
s Sch
i
ndelin
fix
u
p! Merge pull request #158
from kasal/t
e
st-simpl
i
fy
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-11
Joha
n
nes
S
chindelin
fixup
!
Merge
p
u
l
l request #156 from kasal/
t
e
s
t
-fix
-
rev
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-11
Johannes
Schindelin
Merge branch 'some-CR-fixes'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-11
Joh
a
nnes Schind
e
l
i
n
D
i
sab
l
e t0110's
h
i
gh-b
i
t test on Windows
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-11
Johan
n
es Schind
e
lin
Work around a p
r
obl
e
m
identi
f
ied by B
u
ildHi
v
e
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-11
Joha
n
nes Schindelin
t1050: Fix in
v
a
lid call
t
o d
d
(1)
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-11
Johannes Schindeli
n
MinGW: Skip test redi
r
ecting
t
o fd 4
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-11
Johan
n
es Sch
i
ndelin
Handle ne
w
t15
0
1 test
case properly
wi
t
h MinGW
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-11
Johannes Schindelin
Windows: make sure that
merge-octopus only
outputs
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johan
n
es Schindelin
Start the me
r
ging-
r
ebase
to v1
.
9
.
2
commit
|
commitdiff
|
tree
2014-04-09
Johann
e
s Schindeli
n
Mer
g
e bra
n
ch 'tag-contains'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-09
Johannes
Sc
h
indelin
Touch
up the com
m
ent
s
in the 'tag-contains' branch
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-03
J
oh
a
nne
s
S
chi
n
delin
Mer
g
e pull re
q
uest #158
fr
o
m kasal
/
test-simplify
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-03
Johannes S
c
hindelin
Merge
p
u
l
l request #159
from
kasal/c
o
nfig-c-warning
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johannes S
c
hindelin
Merge pul
l
request #156 from
kasal/test-fix-rev
commit
|
commitdiff
|
tree
2014-04-10
Johanne
s
Schindelin
M
erge b
r
an
c
h '
t
ag-contain
s
'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johannes Schindelin
Touch up
t
h
e
comments in the 'tag-con
t
ains' b
r
a
n
ch
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
J
ohannes Sch
i
nd
e
l
in
Avoid bash-ism
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johannes Schindelin
Merge pull
r
e
qu
e
st #122 from kble
e
s/kb/lo
n
g-
p
at
h
s-v2
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johannes Schindelin
Merge
p
ull reques
t
#126 from
R
omanBelinsky/maste
r
commit
|
commitdiff
|
tree
2014-04-10
Johannes Schindel
i
n
M
erg
e
pull reque
s
t
#11
5
from msysgit/tip4
c
ommit
commit
|
commitdiff
|
tree
2014-04-10
J
o
hannes Schindelin
Add
a
README
.
md
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johannes Sch
i
n
delin
M
e
r
ge remote-tracking branch 'kblees/kb/fs
c
a
che-
v
4
.
.
.
commit
|
commitdiff
|
tree
2014-04-10
Joh
a
nnes Sch
i
ndelin
Merge 'poll-busy-wait' into HEAD
commit
|
commitdiff
|
tree
2014-04-10
Johannes Schinde
l
i
n
Merge
'
no
r
ma
l
ize-win-paths' int
o
HEAD
commit
|
commitdiff
|
tree
2014-04-10
Joh
a
n
nes Sc
h
indelin
Merge 'msvc
-
link-crt' into HEAD
commit
|
commitdiff
|
tree
2014-04-10
Johannes Schindelin
Merg
e
'install-winc
r
ed' i
n
to
HEAD
commit
|
commitdiff
|
tree
2014-04-10
J
o
han
n
es Schindeli
n
M
e
rge 'fix-is-exe' into HEAD
commit
|
commitdiff
|
tree
2014-04-10
Johannes Schindelin
Me
r
ge 'fix-exter
n
als' into HEAD
commit
|
commitdiff
|
tree
2014-04-10
Johannes Schindelin
Me
r
ge
'stash-reflog'
i
nto HEAD
commit
|
commitdiff
|
tree
2014-04-10
Johannes
S
c
hindelin
Merge 'http-msys-paths' into HEAD
commit
|
commitdiff
|
tree
2014-04-10
Johannes Schindel
i
n
Merge 'r
e
mot
e
-hg-
p
rerequisites'
i
nto HEAD
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johannes Schindelin
Merge 'win-tests-fixe
s
' into
HE
A
D
commit
|
commitdiff
|
tree
2014-04-10
J
ohan
n
es Sc
h
indelin
Merge 'gr
e
p-fixes' into
HEAD
commit
|
commitdiff
|
tree
2014-04-10
Johannes S
c
hindelin
Merge
'
pull-rebase-interactive' into HEAD
commit
|
commitdiff
|
tree
2014-04-10
Johannes Schindelin
Merge 'send-email' into HEAD
commit
|
commitdiff
|
tree
2014-04-10
Johannes Schindelin
Me
r
ge 'j
b
ere
z
anski/wincred-sso-
r
2
'
int
o
H
E
AD
commit
|
commitdiff
|
tree
2014-04-10
Johannes Schinde
l
in
Merge 'gitweb-syntax' into H
E
AD
commit
|
commitdiff
|
tree
2014-04-10
Johan
n
es Schinde
l
in
Merge 'gitk' int
o
H
EAD
commit
|
commitdiff
|
tree
2014-04-10
Johannes Schindelin
Merg
e
'git-gui' in
t
o HEAD
commit
|
commitdiff
|
tree
2014-04-10
Jo
h
annes Schinde
l
in
Mer
g
e 'deny-c
u
rrent-b
r
anch' into HEAD
commit
|
commitdiff
|
tree
2014-04-10
Johannes
S
chinde
l
in
M
e
rge 'criss-cros
s
-merg
e
' i
n
to
HEA
D
commit
|
commitdiff
|
tree
2014-04-10
J
o
hannes Sch
i
ndelin
Merg
e
'am-subm
o
dule
s
' into HEAD
commit
|
commitdiff
|
tree
2014-04-10
J
ohannes Sch
i
ndelin
Merge 'unc' into HEAD
commit
|
commitdiff
|
tree
2014-04-10
J
o
hannes Schindel
i
n
M
erge 'home
'
int
o
HE
A
D
commit
|
commitdiff
|
tree
2014-04-10
Johann
e
s Schinde
l
in
Merge 'hide-d
o
tg
i
t' into HEAD
commit
|
commitdiff
|
tree
2014-04-10
Johannes
S
c
hindelin
Merge 'unicode'
i
nto HE
A
D
commit
|
commitdiff
|
tree
2014-04-10
J
ohannes Schindelin
Merge
'
u
n
c
' int
o
HEAD
commit
|
commitdiff
|
tree
2014-04-10
Johannes S
c
hindelin
M
e
r
ge b
r
anch 'kb/hashmap-v5-minimal' into kb/fscache
.
.
.
commit
|
commitdiff
|
tree
2014-04-10
Jo
h
annes Schindelin
git s
t
a
s
h: make sure that
.
git/logs
/
refs/ exists
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johann
e
s Schind
e
lin
Handle http
.
*
confi
g
variables pointing
t
o files gracefully
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Joh
a
nnes Schi
n
delin
Always auto-gc after calling
a
f
ast-import tr
a
nsport
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
J
ohannes Schindelin
fast-expo
r
t: do
n
ot refer to non
-
e
xisting marks
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johannes Schinde
l
in
D
i
s
abl
e
t
0
110's
h
igh-bit test on W
i
ndo
w
s
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johannes Schindelin
Fix t3404 for Window
s
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johannes S
c
h
i
ndelin
Work aro
u
nd
a
problem identi
f
ied by BuildHiv
e
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johannes S
c
hindelin
t1050
:
Fix invalid ca
l
l to
dd(1)
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johannes
S
chindelin
Introduce and use
t
e
s
t
_c
m
p_text
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Joh
a
n
n
es Sch
i
ndelin
Windows: make
sure that
merge-octopus
o
nly outputs
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johan
n
es Schind
e
lin
t030[02]: work around CR/LF issue
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johannes Schin
d
elin
MinGW: Skip tes
t
redirecting to fd 4
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Jo
h
annes Schindelin
Handl
e
new
t150
1
te
s
t case properly with
Mi
n
GW
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johann
e
s Schindel
i
n
Work a
r
oun
d
funny C
R
is
s
ue
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
J
o
hannes Sc
h
ind
e
lin
g
r
ep -I: do n
o
t
b
other to read known-binary file
s
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johannes Sc
h
indelin
git grep -O -i:
if the pager i
s
'less', pass
the '
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johannes Schindelin
Tea
c
h
'git re
m
ote
'
that the
c
onfig var b
r
an
c
h
.
*
.
rebase
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johannes
Schinde
l
i
n
Handle the branch
.
<name>
.
reb
a
se value 'in
t
eractive'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johannes Sc
h
ind
e
lin
Teach
'
git
pull'
to ha
n
dle
-
-re
b
ase=interactive
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Jo
h
annes S
c
hindeli
n
g
itweb (SyntaxHighlighter):
interp
r
e
t
#l<line-n
u
mber>
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johannes Schindelin
Only sw
i
tc
h
on the line number t
o
ggle
wh
e
n highlighting
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
J
o
h
ann
e
s Schinde
l
in
Git
w
eb:
a
dd support fo
r
A
lex Gorb
a
tche
v
's SyntaxHighlighter
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johannes
S
chindelin
Gitweb
:
make lin
e
num
b
er toggling
w
o
r
k
for Firefox
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Joha
n
nes
Schindelin
gitwe
b
:
Allow line
number toggli
n
g
w
ith Javascript
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johannes Schinde
l
in
Work
a
round the command li
n
e
l
imit
o
n
Windows
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Joh
a
nnes Schindelin
g
it gui: set GIT_ASKPAS
S
=
git
-
gui--ask
p
ass i
f
n
o
t
set
yet
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Jo
h
ann
e
s
Schindelin
Let
d
eny
.
currentBranch=up
d
ateIn
s
tead igno
r
e submodules
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johanne
s
Schinde
l
in
A
dd a f
e
w
more value
s
f
o
r
receive
.
denyCurrentBran
c
h
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Jo
h
an
n
e
s Schind
e
l
i
n
gi
t
am: i
g
no
r
e dirty s
u
bmodules
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Jo
h
annes Sc
h
i
ndelin
A
dd a Wind
o
w
s-specific fallback to gete
n
v("HOME")
;
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johannes Schindelin
When initi
a
lizing
.
git/,
re
c
ord the
c
urrent setti
n
g
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-04-10
Johanne
s
Sc
h
indelin
Let mingw_execve() return an int
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-02-17
Johannes Schindelin
A
v
oid bash-ism
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-02-17
Johannes Schin
d
elin
Merge pull request #122 f
r
om kblees/kb/lo
n
g-
p
aths-v2
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-02-17
Johann
e
s Schindelin
M
e
r
g
e pull reques
t
#126 from RomanBel
i
nsky/
m
a
ster
commit
|
commitdiff
|
tree
2014-02-17
Johannes
Schindelin
Me
r
g
e
pull
r
equest #
1
15 fro
m
msysg
i
t/tip4commit
commit
|
commitdiff
|
tree
2014-02-17
Johannes Schindelin
Add
a
README
.
m
d
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-02-17
Jo
h
annes Schind
e
lin
Merge remote-tracking bran
c
h '
k
b
lees/kb/f
s
cache-v4
.
.
.
commit
|
commitdiff
|
tree
2014-02-17
J
ohannes
S
chindelin
Mer
g
e 'poll-busy-wait' into HE
A
D
commit
|
commitdiff
|
tree
2014-02-17
Johannes Sc
h
indelin
Mer
g
e '
n
or
m
aliz
e
-w
i
n
-paths'
in
t
o HEAD
commit
|
commitdiff
|
tree
2014-02-17
Johannes
Schindelin
Merge 'ms
v
c-link-c
r
t'
int
o
HEAD
commit
|
commitdiff
|
tree
2014-02-17
Johannes Schindelin
Merge '
i
nstall
-
w
incred' into HEAD
commit
|
commitdiff
|
tree
2014-02-17
Johannes S
c
hin
d
elin
M
e
rge 'fix-is-exe' into
H
E
AD
commit
|
commitdiff
|
tree
2014-02-17
Joh
a
nnes
S
chindelin
Merge 'fix-extern
a
ls'
into HEAD
commit
|
commitdiff
|
tree
2014-02-17
J
ohannes
S
chi
n
delin
Merge 'stash-reflog' i
n
to
H
EA
D
commit
|
commitdiff
|
tree
2014-02-17
Johan
n
es Schi
n
delin
Mer
g
e
'
http-msys-paths' into HEA
D
commit
|
commitdiff
|
tree
2014-02-17
Johanne
s
S
c
h
i
ndelin
Me
r
ge 'remo
t
e-hg-prerequisites
'
into H
E
AD
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2014-02-17
Johannes Schindelin
Merge
'
w
i
n-te
s
ts-fixes' into HEAD
commit
|
commitdiff
|
tree
next