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-file: add option to select union merge favor
2010-03-03
Bert Wesarg
mer
g
e-
f
ile:
a
dd
o
p
t
i
on t
o
s
e
lec
t
union m
e
rge
f
avor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-03
Ber
t
Wesa
r
g
merge-file: add
o
ption to specify the mark
e
r
size
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
Bert We
s
a
r
g
refactor merge flags into xmpar
a
m_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
Bert Wesarg
m
a
ke union merge an xdl merge
f
a
v
o
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
J
u
nio
C H
a
ma
n
o
Git 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Junio C
Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-02-12
Ju
n
io C Hamano
F
i
x typo in 1
.
6
.
6
.
2 re
l
eas
e
notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Junio C Hamano
Re
-
fix check-re
f
-format docu
m
entation ma
r
k-up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Junio
C
Haman
o
archive document
a
tion
:
attributes are taken from the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Michael J
Gru
b
er
Docu
m
ent
a
t
i
on
:
minor fixes
to Rel
N
otes-1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
SZEDER Gábor
ba
s
h: support 'git am's new '--conti
n
ue' option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Juni
o
C
H
a
mano
Merge b
r
a
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-02-12
Jacob Helwig
f
i
lter-branc
h
:
Fi
x
e
rror messa
g
e for --prune-empty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Jeff King
am:
s
witch --resolved t
o
--continu
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
J
unio
C Hamano
Update draft release
not
e
s
to 1
.
7
.
0
one more time
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Junio C Haman
o
S
y
n
c wi
t
h
1
.
6
.
6
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Junio C
H
a
mano
Git 1
.
6
.
6
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Junio C
Hamano
Merge branch 'maint-1
.
6
.
5' in
t
o maint
commit
|
commitdiff
|
tree
2010-02-10
J
u
nio C Haman
o
t8003: c
h
eck exi
t
co
d
e o
f
command and error messag
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Junio C
Hamano
Mer
g
e
b
ranch
'sp/
m
ain
t
-fast-impo
r
t-la
r
ge-
b
lob' into
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Junio C H
a
mano
Me
r
ge branch
'
gp/maint
-
cvsserver' into ma
i
nt
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Merge branch 'jc/ma
i
nt-reflo
g
-bad-times
t
a
mp' into maint
commit
|
commitdiff
|
tree
2010-02-10
Ju
n
io C
Ha
m
ano
Merge
b
ranch '
i
l/maint-xmal
l
o
cz' i
n
to m
a
i
n
t
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Merge branch 'jh/maint-config-file-p
r
e
fix' into main
t
commit
|
commitdiff
|
tree
2010-02-10
Junio
C
Hama
n
o
Merg
e
branch 'nd/includ
e
-termios-for-osol' into maint
commit
|
commitdiff
|
tree
2010-02-10
Jun
i
o C Hamano
Merge br
a
nc
h
'jc/
m
ain
t
-1
.
6
.
1-checkout-m-custom-me
r
ge
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Merge branch
'
rs/maint-archiv
e
-match-p
a
ths
p
e
c
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Jun
i
o C
H
amano
che
c
k-ref-format
d
ocume
n
tation: f
i
x enumeration mar
k
-
up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Thomas Rast
Doc
u
mentati
o
n: quote braces in {upstream} notat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-09
Brian
G
ernhardt
t3902
:
Pro
t
e
c
t against OS X n
o
rmali
z
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-09
Junio C Hamano
Me
r
ge bra
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2010-02-09
Junio C
H
amano
Merge branch 'maint
-
1
.
6
.
5'
into
m
a
int
commit
|
commitdiff
|
tree
2010-02-09
Jay Sof
f
ian
blame: prevent a
s
e
gv
w
h
e
n
-L given start > EOF
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-09
Junio C Ha
m
ano
M
e
rge
branch 'jc/ma
i
nt-push-doc-status' into
m
aint
commit
|
commitdiff
|
tree
2010-02-09
Junio C Ham
a
no
g
i
t
-push: document all
the stat
u
s flags us
e
d in the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-08
Junio C H
a
mano
Merge
branch 'jc/ma
i
n
t-im
a
p-conf
i
g-parse' into maint
commit
|
commitdiff
|
tree
2010-02-08
J
unio
C
Ha
m
ano
F
i
x parsing of
i
map
.
pre
f
orma
t
ted
H
TML and imap
.
sslve
r
i
fy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-08
Jun
i
o
C
Ham
a
no
Merge branch 'jc/maint-doc-git-
a
dd-exa
m
ple' into
maint
commit
|
commitdiff
|
tree
2010-02-08
J
unio C Hamano
git-add do
c
umen
t
a
t
ion: Fix shell quot
i
ng example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-08
N
i
co
l
as Pitre
Revert "pack-object
s
: fix pac
k
gene
r
ation when using
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-07
Juni
o
C H
a
mano
Merge git://repo
.
or
.
c
z/g
i
t-gui
commit
|
commitdiff
|
tree
2010-02-07
J
u
n
io C Hamano
Me
r
ge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-02-07
René
Sc
h
arfe
archi
v
e: simplify
archive
format gu
e
s
s
in
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Jeff King
Fix invalid read in quote_
c
_st
y
le_counted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Je
f
f King
doc
s
: fix fi
l
ter-branch example for quoted paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Br
i
a
n
Gernha
r
dt
t
9501: Re-
f
i
x
m
ax
load test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Björn Gustavsson
bash: support the --au
t
osquash o
p
tion for rebas
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Junio C Ha
m
ano
M
erge git
:
//git
.
kernel
.
org
/
p
ub/scm/gitk/
g
itk
commit
|
commitdiff
|
tree
2010-02-06
B
r
ian
Ger
n
h
ardt
t950
1
: Skip te
s
ting load if we
c
an
'
t
detect i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Junio C Hamano
Update dra
f
t
r
elease not
e
s to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Jun
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-02-05
W
e
sle
y
J
.
Landaker
Update git
f
sck --f
u
ll short descr
i
pt
i
on
to
men
t
ion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-05
Jun
i
o
C Hamano
Mer
g
e branch
'
jc/maint
-
limit-
n
ote-
o
u
t
p
u
t' into ma
i
nt
commit
|
commitdiff
|
tree
2010-02-05
Junio C H
a
mano
Rev
e
r
t
30816237 and 7e6
2
265
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Junio C Hamano
f
a
s
t
-import:
count --
m
a
x-pack-size in bytes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Nicolas Pitre
upda
t
e
gi
t
-repack documentation wrt rep
a
ck
.
UseDeltaBaseOff
s
et
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Michael J Gruber
g
it-clean: fix the des
c
ripti
o
n of the default behavior
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Ju
n
io C H
a
mano
fast-
i
mport
.
c: Fix big-file-
t
hresh
o
l
d
pars
i
n
g
bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Nico
l
as P
i
tre
make --ma
x
-
p
ack-si
z
e
argument to 'git
pa
c
k-object'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Ni
c
ol
a
s Pitre
pack-obje
c
ts: fix pack generation when using pack_size_
l
imi
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
N
i
colas Pitre
fix mul
t
iple
i
s
sue
s
with t5300
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
John 'Warthog
9
'
.
.
.
g
i
tw
e
b: Sim
p
lify (an
d
fix)
c
hop_str
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-03
René
Sch
a
rfe
grep: simplify assignment
of -
>
f
i
xed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-03
Ju
n
io C Hama
n
o
Merge
branch 'ms/filter-branch-
s
u
bmodule'
commit
|
commitdiff
|
tree
2010-02-03
Junio C Hamano
Merge branch 'j
h
/g
i
t
web-caching'
(
early p
a
rt)
commit
|
commitdiff
|
tree
2010-02-03
Ju
n
i
o
C Ha
m
ano
Merge branch
'
b
w
/no-python-autoconf'
commit
|
commitdiff
|
tree
2010-02-03
Junio C Hama
n
o
Merge branch 'sp
/
fa
s
t-im
p
ort-large-blob'
commit
|
commitdiff
|
tree
2010-02-02
Sha
w
n
O
.
Pe
a
rce
Correct sp
e
lling
o
f
'REUC'
e
xtension
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-02
J
u
nio C Ha
m
an
o
bui
l
d: make code
"
-
W
pointer-arith" clean
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Ben Walton
co
n
figur
e
: Al
l
ow
--without-p
y
t
hon
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Ben Walton
co
n
figur
e
: Allow GIT_AR
G
_
S
ET_P
A
TH to handle --withou
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Junio C Hamano
Mer
g
e branch 'sp/maint-
f
ast-im
p
ort-large-b
l
ob'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2010-02-01
S
h
awn
O
.
Pearce
fast-import: S
t
r
eam very large
b
lobs
d
irec
t
ly to pack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Pal-Kristian Engstad
git-p4:
Fix sync
e
rrors du
e
to new server
v
e
rsion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Jens Lehm
a
nn
Updates for d
i
rt
y
s
u
bmodule
s
in release notes and user
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Junio C
Ham
a
no
M
erge branch 'sb/maint-octopus' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-02-01
J
uni
o
C H
a
mano
M
e
r
g
e branch 'bg/
m
aint-ad
d
-al
l
-doc' i
n
t
o
maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-31
J
u
n
io C
H
amano
U
p
date dr
a
ft release note
s
to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
J
u
n
i
o C Hamano
Mer
g
e
branch '
d
m/make-t
h
readed-simplify'
commit
|
commitdiff
|
tree
2010-01-31
Dan
McGee
Mak
e
NO_
P
THREADS t
h
e
s
ole th
r
ead
configuration variab
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
Junio C Hamano
RPM
packagi
n
g
:
us
e
%g
l
obal inside %{!
?
.
.
.
}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
Jeff Ki
n
g
menti
o
n
new shell e
x
ec
u
tion behavi
o
r in releas
e
notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
Jens Lehmann
Fix memor
y
l
eak in submo
d
ule
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
Ralf Wildenhues
F
ix
typos in technic
a
l
d
o
c
u
m
e
ntation
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
J
o
hn 'Warth
o
g9'
.
.
.
gitweb: Add op
t
ional extra paramet
e
r to
die_error,
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
J
ohn '
W
arthog9'
.
.
.
gitweb: add
a "strin
g
"
va
r
iant of pr
i
nt_sort_
t
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
John '
W
art
h
og9'
.
.
.
g
i
t
web: add a "string" varia
n
t of print_loc
a
l_time
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
John 'Warthog9'
.
.
.
gitweb
:
Che
c
k th
a
t $site_header etc
.
a
r
e define
d
be
f
ore
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
John '
W
a
r
thog9'
.
.
.
gitweb: Makefile impr
o
vem
e
nts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
John 'Warth
o
g9'
.
.
.
gitweb: Loa
d
c
heckin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Jakub N
a
rebski
gitweb: Mak
e
running t95
0
1
test with '--debug' reliab
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Jun
i
o C Hamano
is_submodule_modified
(
): fix breakage with
ex
t
ernal
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Ju
n
io
C H
a
mano
RPM pa
c
kagi
n
g
: don't include
fo
r
e
i
gn-sc
m
-hel
p
er bit
s
yet
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Dan
M
c
Gee
gr
e
p: Fix tw
o
memory leak
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Markus Heidelber
g
rebase: don't invoke the pager for
e
a
c
h commi
t
summ
a
ry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Ju
n
io C Hamano
Update draft release no
t
es
t
o 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Junio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-30
J
u
n
i
o C Haman
o
Merge branc
h
'maint-1
.
6
.
5' in
t
o
mai
n
t
commit
|
commitdiff
|
tree
2010-01-30
J
ohannes Sixt
Impleme
n
t
p
thread_cond_bro
a
dcast on Wi
n
dows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
S
e
bastian
S
c
h
uberth
If derivi
n
g SVN_SSH from GIT_
S
SH on
msys, also a
d
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next