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
Remove filename from conflict markers
2009-07-02
Ma
r
tin
R
enol
d
Remove file
n
a
m
e
f
r
om
c
onflict
m
arkers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-07-02
Jun
i
o C H
a
m
ano
Me
r
g
e
b
ranch '
c
c/bisect'
commit
|
commitdiff
|
tree
2009-07-02
Junio
C
H
a
m
a
no
Merge branch 'js/daemon-lo
g
'
commit
|
commitdiff
|
tree
2009-07-02
Junio C Ha
m
ano
Mer
g
e branc
h
'cf/maint-r
e
mote-
u
p
l
oadpack-useconfig
.
.
.
commit
|
commitdiff
|
tree
2009-07-02
Ju
n
io C Hamano
Merge b
r
anch 'sb/quiet-porc
e
l
a
ins'
commit
|
commitdiff
|
tree
2009-07-02
Junio C Ha
m
ano
Mer
g
e
b
r
anch
'
ne/maint-1
.
6
.
0-
d
i
f
f-tree-t-r
-
show-d
i
rectory'
commit
|
commitdiff
|
tree
2009-07-02
J
u
nio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-07-01
Michal Marek
reque
s
t
-
pull: r
e
ally rea
l
ly disa
b
le pag
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-07-01
J
ef
f
King
l
og-tree: fix confusing co
m
men
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-30
Junio C
H
amano
Merg
e
b
ra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2009-06-30
René Scha
r
fe
attr: plug min
o
r memory l
e
a
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-30
Brandon Cas
e
y
git
.
c: avoid allocating one-to
o
-many
elements
for n
e
w
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-30
Junio C
Hamano
req
u
est-
p
ull: really d
i
sable
pag
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-30
Johanne
s
Si
x
t
git-mv
:
fix d
i
rectory
separator
treatmen
t
o
n
W
indows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-30
St
e
phen Boyd
comp
l
etion: add mis
s
ing config
variables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-30
Thadeu Lima
d
e Souza
.
.
.
Makes
some clea
n
up/review in gitt
u
t
orial
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-30
Joh
a
nnes Sixt
Makefile: git
.
o depends on library headers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-30
Miklo
s
Vajna
git-submodule document
a
tion: fix
f
oreach
examp
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-29
Linus Torvalds
git log
:
add '--merg
e
s' flag
t
o matc
h
'--no-merges'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-28
Ju
n
io C
H
am
a
no
Merg
e
gi
t
://git
.
bogomip
s
.
or
g
/git-svn
commit
|
commitdiff
|
tree
2009-06-27
Junio C Ham
a
no
Merge branch 'pb/send-email-cccmd-f
i
x'
commit
|
commitdiff
|
tree
2009-06-27
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-06-27
G
iu
s
eppe Bilotta
g
i
t
we
b
/READ
M
E
:
fix A
l
iasMatch in example
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-27
T
h
o
m
as Rast
Test gre
p
-
-
a
n
d/--
o
r/--not
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-27
Thomas
Ra
s
t
Test
g
it arch
i
ve --remote
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-25
C
hris F
r
ey
gi
t
-remote: fi
x
mis
s
ing
.
u
p
l
oadpack
u
sage
f
o
r show
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-23
Roel
Kluin
frea
d
does n
o
t return negative on error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-23
B
ert Wesarg
builtin
-
remote: (get_
o
ne_entry): use s
t
rbuf
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-23
Br
a
ndon Casey
t
/t900
1
-send-email
.
sh: ensure generated
s
cript is execute
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-22
Junio C Ham
a
no
Me
r
ge bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-06-22
Johannes S
i
xt
t3
7
00-add:
ad
d
a
POSIXPERM prerequisite to a ne
w
t
e
st
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-22
J
u
nio C H
a
mano
Me
r
g
e
bra
n
ch
'sb/maint-1
.
6
.
0-add-config-f
i
x' in
t
o maint
commit
|
commitdiff
|
tree
2009-06-22
J
u
nio C
H
a
mano
Syn
c
with 1
.
6
.
3
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-22
Junio C
H
aman
o
GIT 1
.
6
.
3
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-22
J
u
nio C Haman
o
Me
r
ge branch 'a
k
/
m
aint-for-
e
ach-ref
-
n
o-
l
ookup'
into
.
.
.
commit
|
commitdiff
|
tree
2009-06-22
Junio C
Ham
a
no
Merge branch 'rc/maint-http-local-slo
t
-fi
x
'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2009-06-22
Ju
n
io C
Hamano
M
e
rge bra
n
ch 'cb
/
maint-no-double-mer
g
e' into maint
commit
|
commitdiff
|
tree
2009-06-22
Juni
o
C
Hamano
Merge
b
ranch 'mn/maint-iconv-autoc
o
nf' into maint
commit
|
commitdiff
|
tree
2009-06-22
J
u
nio
C
Hamano
Mer
g
e
b
ranch 'lt/maint-
u
nsigned-left-shi
f
t'
into
m
a
i
n
t
commit
|
commitdiff
|
tree
2009-06-22
Junio
C
Ham
a
no
Merge branch 'pb/maint-1
.
6
.
2-userdiff-fix' into
maint
commit
|
commitdiff
|
tree
2009-06-22
Johanne
s
Six
t
re
c
e
i
ve-
p
ack: d
o
not send error details to the client
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-21
Junio C Hamano
a
ttribute: whitespace
set to true detects
a
ll errors
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-21
Nanak
o
Shirais
h
i
.
gitattr
i
butes: CR
a
t the end of the line is
a
n error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-21
Jun
i
o C Hamano
t3505
:
fix abuse o
f
test_exp
e
ct_
c
o
d
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-21
J
unio
C
Hamano
Me
r
ge bran
c
h
'
m
aint'
commit
|
commitdiff
|
tree
2009-06-21
Junio C Hamano
Merge
b
ranc
h
'mai
n
t
-
1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2009-06-21
Junio C Hamano
Merge branch 'maint-1
.
6
.
1' into ma
i
nt-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-21
J
u
nio C
H
amano
Merge branch 'maint-1
.
6
.
0' into mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-21
Stephen Boyd
git
-
show-ref
.
txt: remove word and make consiste
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-21
Li
n
us Tor
v
alds
Fi
x
variou
s
sparse warnings in
the
git
s
o
urce cod
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-21
Junio C Hamano
Merge b
r
a
n
ch 'ph
/
submodule-
r
eba
s
e'
commit
|
commitdiff
|
tree
2009-06-21
Junio
C
Ham
a
no
Merge b
r
anc
h
'jc/cache-tree'
commit
|
commitdiff
|
tree
2009-06-21
J
u
nio C Hamano
M
e
rg
e
b
r
anch '
m
g/pushurl'
commit
|
commitdiff
|
tree
2009-06-21
Junio C H
a
mano
Merge branch 'mn/m
a
int-
i
conv
-
autoconf
'
commit
|
commitdiff
|
tree
2009-06-21
Junio
C
Hamano
Merge bran
c
h
'sb/pull
-
reb
a
se'
commit
|
commitdiff
|
tree
2009-06-21
Junio C Hamano
Merge branch
'pb/se
n
d-email-cccmd-f
i
x'
commit
|
commitdiff
|
tree
2009-06-21
Junio C Haman
o
M
er
g
e branch 'pb/
m
aint-1
.
6
.
2-u
s
erdiff-fix'
commit
|
commitdiff
|
tree
2009-06-21
Jun
i
o C
Haman
o
Merge branch 'sb/maint-1
.
6
.
0-add-config-f
i
x'
commit
|
commitdiff
|
tree
2009-06-21
J
u
nio
C
Hamano
Merge bran
c
h
'
lt
/
maint-unsigned-
l
e
f
t-shift'
commit
|
commitdiff
|
tree
2009-06-21
Miklos Vajna
git-sv
n
docum
e
ntation: fix typo in
'
rebase vs
.
pull
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-20
J
u
nio C
H
amano
Merge gi
t
://g
i
t
.
ker
n
el
.
or
g
/pub/scm/gitk/
g
itk
commit
|
commitdiff
|
tree
2009-06-18
S
t
ephen
Boyd
add:
a
l
l
ow configur
a
tions to be o
v
erriden
by command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-18
Stephen Boyd
s
t
ash: teach
qui
e
t option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-18
Stephen
B
oyd
am
,
r
e
b
a
s
e
: teach quiet optio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-18
Johanne
s
Sixt
upload-pack:
s
q
u
el
c
h
progres
s
indicator if client can
n
ot
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-18
Johannes Sixt
daem
o
n
: send
s
t
derr of service program
s
to the sy
s
log
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-18
J
u
ni
o
C
Hamano
M
e
rge br
a
nch '
m
aint'
commit
|
commitdiff
|
tree
2009-06-18
Junio C
H
a
mano
Merge branch 'sb
/
parse-options-integ
e
r
'
commit
|
commitdiff
|
tree
2009-06-18
Junio C Haman
o
M
e
r
g
e branch 'ak/m
a
int-for-ea
c
h-re
f
-no
-
looku
p
'
commit
|
commitdiff
|
tree
2009-06-18
Alex Bennée
Add -k o
p
tion t
o
cvsexportcommit to r
e
vert expa
n
ded
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-18
Mark Lo
d
ato
http
.
c: fix compiling with l
i
bcurl 7
.
9
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-18
Paolo Bonzini
Test
c
ccmd
i
n t9
0
01-send-email
.
sh and fix some
bu
g
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-18
Johan
n
es Schindelin
i
mp
o
rt-tars: support symlinks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-18
René Scharfe
upload-archiv
e
: fix infin
i
te
l
oop on Cy
g
win
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-18
Paolo Bon
z
ini
avoid exponentia
l
reg
e
x
match for java
a
n
d
ob
j
c function
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-18
Stephe
n
Boyd
submo
d
ule, repack
:
mig
r
ate to git
-
sh-se
t
up
'
s sa
y
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-18
S
t
ephen Bo
y
d
git-sh-setup: introduce say() for quiet option
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-18
Stephen Boyd
am: suppress a
p
ply errors when u
s
ing 3-way
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-18
St
e
phen Boyd
t4150: t
e
st applying wi
t
h
a
ne
w
l
i
ne in
subj
e
ct
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-18
L
i
nu
s
T
o
rva
l
d
s
F
i
x big
lef
t
-shifts
o
f u
n
signe
d
char
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-15
St
e
phen Boyd
pull,
r
ebase: si
m
p
lify to use die()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-14
Jim
Meyering
use xst
r
dup,
not strdup in ll-merge
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-14
Jim Mey
e
ring
avoid
N
U
LL der
e
fer
e
nce o
n
failed
mal
l
oc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-14
Junio C Hamano
Merge bra
n
ch
'
m
ain
t
'
commit
|
commitdiff
|
tree
2009-06-14
Junio
C Hamano
Merge
b
r
a
nch 'maint-
1
.
6
.
2'
into maint
commit
|
commitdiff
|
tree
2009-06-14
Junio C Hamano
Me
r
g
e
branch
'
m
a
i
nt-
1
.
6
.
1'
into maint
-
1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-14
Junio
C
Hama
n
o
M
e
rge
b
r
anch 'maint-1
.
6
.
0
' into
mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-14
Nic
k
Edelen
d
i
ff-t
r
ee -
r
-t: include added/
r
e
moved di
r
e
ctories
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-13
Junio C Hamano
M
e
rge b
r
anch 'mh/f
i
x-sen
d
-emai
l
-
t
h
readed'
commit
|
commitdiff
|
tree
2009-06-13
J
u
nio C H
a
m
a
no
Merge br
a
n
c
h
'rc/http-push'
commit
|
commitdiff
|
tree
2009-06-13
Jun
i
o C
Ham
a
no
Merg
e
branch 'cc/bisect' (
e
arly pa
r
t)
commit
|
commitdiff
|
tree
2009-06-13
Junio
C
Hamano
Merge
branch '
r
c/maint-http-local-sl
o
t-fix'
commit
|
commitdiff
|
tree
2009-06-13
Junio C Hama
n
o
Merge bra
n
ch 'sp/msys
g
it'
commit
|
commitdiff
|
tree
2009-06-13
Junio
C
Hamano
M
erge branch 'cb/maint-n
o
-
d
ouble-me
r
ge'
commit
|
commitdiff
|
tree
2009-06-13
Junio C Hamano
Merge
b
ran
c
h '
p
h
/submodule-rebase'
(
ea
r
ly part)
commit
|
commitdiff
|
tree
2009-06-13
J
u
n
i
o C
Hamano
Merge bra
n
ch 'bc/solaris'
commit
|
commitdiff
|
tree
2009-06-13
J
u
n
io C
Hamano
M
e
rge b
r
a
n
ch 'cb/match_r
e
fs_internal_tail'
commit
|
commitdiff
|
tree
2009-06-13
Jun
i
o
C
Hama
n
o
Merge
branch 'n
w
/maint-cv
s
expo
r
tcomm
i
t'
commit
|
commitdiff
|
tree
2009-06-13
Jun
i
o
C Hamano
Merge branch
'da/araxis-m
e
rgetool'
commit
|
commitdiff
|
tree
2009-06-13
Stephen Boyd
git-rerere
.
txt: grammatical
fixups and
c
leanu
p
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next