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
Be
r
t Wes
a
r
g
merge-fi
l
e: ad
d
option to
s
elect union merge favor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-03
Bert Wesarg
merg
e
-file: add option to speci
f
y the marker
s
ize
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-02
Bert
W
esarg
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
make
u
nio
n
me
r
g
e
an x
d
l
merge
f
avor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
Junio C Hamano
Git
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
J
unio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-02-12
J
u
nio C Ha
m
an
o
Fi
x
typo in 1
.
6
.
6
.
2
r
elease n
o
t
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
Junio C
Hamano
Re-fix check-r
e
f
-format
d
ocumentation mark-up
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
Junio C Hamano
archive
d
ocu
m
entati
o
n:
att
r
i
b
u
t
e
s
are take
n
from the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
M
ichae
l
J Grub
e
r
Documen
t
ation: min
o
r
f
i
xes to RelNotes-1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
SZED
E
R
G
ábor
b
a
sh: support 'git am's new '--continue' opt
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
Juni
o
C Hamano
Merge bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2010-02-12
J
a
c
o
b
Helw
i
g
fil
t
er-branch: Fix err
o
r message for
-
-pr
u
ne-empt
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
Jef
f
King
am: switch --
r
esolved t
o
--continue
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
Jun
i
o
C Hamano
Up
d
ate
draft
r
el
e
ase n
o
tes to 1
.
7
.
0
o
ne
mo
r
e time
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Sync wit
h
1
.
6
.
6
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Git 1
.
6
.
6
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
Jun
i
o C Hamano
Merge b
r
anch 'ma
i
nt-1
.
6
.
5' in
t
o maint
commit
|
commitdiff
|
tree
2010-02-10
Ju
n
io
C Ha
m
ano
t
8003:
c
heck e
x
it co
d
e of command a
n
d
e
rror
m
e
ssage
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
Junio C
H
a
m
ano
Merge b
r
anch '
s
p/m
a
int-
f
ast-i
m
port-larg
e
-blo
b
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Junio
C Haman
o
Merge bra
n
c
h
'
gp/
m
aint-
c
vsserver' into maint
commit
|
commitdiff
|
tree
2010-02-10
Junio C
H
am
a
no
M
e
rge
bra
n
ch 'j
c
/m
a
int-refl
o
g-
b
ad-time
s
tamp' into m
a
i
nt
commit
|
commitdiff
|
tree
2010-02-10
J
u
nio C
Hamano
Merge branch 'il/mai
n
t-xmallocz' into
maint
commit
|
commitdiff
|
tree
2010-02-10
Juni
o
C
Hamano
M
erge branc
h
'jh/m
a
int-config-file-prefix
'
i
n
t
o maint
commit
|
commitdiff
|
tree
2010-02-10
Ju
n
i
o
C Haman
o
M
erge branch
'
nd/inclu
d
e-t
e
rmios-for-
o
sol' into maint
commit
|
commitdiff
|
tree
2010-02-10
Junio C H
a
mano
Me
r
ge b
r
anch 'j
c
/maint-1
.
6
.
1-che
c
kout-m-cu
s
tom-merge
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Junio C Ha
m
ano
Merge branch 'rs/maint
-
archive-ma
t
ch-pathsp
e
c' into
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Junio C
H
amano
ch
e
c
k-
r
e
f-format documenta
t
ion: f
i
x enumeration mark-up
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
T
homas Rast
D
ocumen
t
ation: quo
t
e bra
c
es in {upstrea
m
} notation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-09
Brian Gernhardt
t3902: Protect against O
S
X n
o
rmalization
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-09
J
unio C
H
am
a
no
M
e
rge branch
'
main
t
'
commit
|
commitdiff
|
tree
2010-02-09
J
unio C Ham
a
no
Merge br
a
nc
h
'maint-1
.
6
.
5'
i
nto maint
commit
|
commitdiff
|
tree
2010-02-09
J
ay Soff
i
an
blam
e
: prevent
a segv when -L g
i
ven s
t
a
r
t > EOF
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-09
Junio
C Hamano
Merge branch 'jc/maint
-
push-
d
o
c-status
'
into maint
commit
|
commitdiff
|
tree
2010-02-09
Junio C Hamano
git-push: document al
l
the status
f
lag
s
u
s
ed
in the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-08
J
u
nio
C Ha
m
a
n
o
Merge branch
'
jc/maint-imap-co
n
f
i
g-p
a
rse' i
n
to m
a
int
commit
|
commitdiff
|
tree
2010-02-08
Juni
o
C Hamano
F
i
x
parsing of i
m
ap
.
p
r
eformattedH
T
ML and imap
.
sslverify
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-08
Junio C Ham
a
no
Merge branch
'
jc/maint-d
o
c-gi
t
-add-example' into mai
n
t
commit
|
commitdiff
|
tree
2010-02-08
Junio C Hamano
git-a
d
d
d
o
cumentation: Fix she
l
l quoting
exa
m
ple
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-08
N
icolas
Pitre
Revert "pack
-
objects: fix
pack generation whe
n
u
s
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-07
J
u
n
io C
H
amano
Mer
g
e git
:
//rep
o
.
o
r
.
c
z
/
git
-
gui
commit
|
commitdiff
|
tree
2010-02-07
Junio
C H
a
mano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-02-07
René Scharfe
archive: s
i
mplify ar
c
hive format guessing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
Jef
f
King
Fix
i
nvalid read in quote_c_styl
e
_c
o
unt
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
Jeff King
docs: fix fil
t
e
r
-
branch
e
xamp
l
e for quoted paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
B
r
ian G
e
rnhardt
t9501:
R
e-fix max
l
oad test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
B
jörn Gust
a
vsson
bash: s
u
pport the --autosquas
h
option for reba
s
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
Junio C Ham
a
no
M
erge git://gi
t
.
kernel
.
or
g
/
pub
/
scm/gi
t
k/gitk
commit
|
commitdiff
|
tree
2010-02-06
Brian Gernha
r
dt
t950
1
:
S
k
ip
test
i
ng load i
f
we ca
n
't
d
etect
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
Jun
i
o C Hamano
Update d
r
aft release notes to
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
J
unio C Hama
n
o
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-02-05
W
e
sley J
.
Landaker
Upd
a
te git
f
sc
k
--f
u
ll short des
c
r
ip
t
ion
to mention
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-05
Jun
i
o
C Hamano
Mer
g
e
b
ranch 'jc/maint-limit-note-output'
i
n
t
o maint
commit
|
commitdiff
|
tree
2010-02-05
Jun
i
o C H
a
mano
Revert 30816237 and
7
e622
6
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
Junio C Hamano
fast-import:
count
--ma
x
-p
a
ck-size in
b
ytes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
N
icol
a
s Pitre
up
d
a
t
e
gi
t
-repa
c
k
documentati
o
n wrt repack
.
U
s
eDeltaBaseO
f
fs
e
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
Michae
l
J Gruber
g
it-clean: fi
x
th
e
d
e
scription of the
de
f
au
l
t behavior
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
Junio
C
Hamano
fast-impor
t
.
c:
Fix big-f
i
le-thresho
l
d
parsing bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
N
i
colas Pitre
make --max-pack-
s
ize argu
m
ent
t
o 'git pack-object'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
N
icolas Pitre
pac
k
-objects: fix
p
ack gener
a
tion when using pack_size_l
i
mit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
N
icolas P
i
t
re
fi
x
m
ultiple issu
e
s w
i
th t5300
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
John
'
Wart
h
og9'
.
.
.
gitw
e
b: Simpli
f
y
(
and fix) chop_str
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-03
René Scharfe
gre
p
:
s
implif
y
assignment
of ->
f
ixed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-03
Junio C Hamano
M
e
rge b
r
a
n
ch '
m
s/fil
t
er-branch-submodule'
commit
|
commitdiff
|
tree
2010-02-03
J
unio C
Hamano
Merge b
r
an
c
h
'j
h
/g
i
tweb-caching' (early
part)
commit
|
commitdiff
|
tree
2010-02-03
Ju
n
io
C
Hamano
Merge br
a
nch 'bw/no
-
python-
a
ut
o
c
o
nf'
commit
|
commitdiff
|
tree
2010-02-03
J
u
nio C Hamano
Merge
b
ranch 'sp/fast-impor
t
-large-blob'
commit
|
commitdiff
|
tree
2010-02-02
Shawn
O
.
Pearce
Correct spellin
g
of 'REUC' extensi
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-02
Ju
n
io C H
a
mano
build: m
a
k
e code "-
W
po
i
nter-
a
rith
"
clean
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-01
Ben
Wa
l
ton
configure: Allow --witho
u
t-py
t
hon
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-01
Ben
W
alto
n
c
onfigure:
A
l
l
ow GIT_AR
G
_SET_
P
ATH to handle --without
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-01
J
u
n
io C Hamano
Merge branch 'sp/main
t
-fa
s
t-import-la
r
ge-blob' into
.
.
.
commit
|
commitdiff
|
tree
2010-02-01
Shawn O
.
Pearce
fa
s
t
-import: Str
e
am
v
ery larg
e
blobs directly to pack
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-01
Pal-Kristia
n
E
ngstad
git
-
p4: Fix sync e
r
ror
s
d
ue
t
o
new server ver
s
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-01
Jens
Lehmann
Upda
t
es for dirt
y
submodules in rel
e
a
s
e
notes
and user
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-01
Ju
n
io C Hamano
Merge
b
r
anch 's
b
/ma
i
nt-octopus' into
m
aint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-02-01
Junio
C Hamano
Merge branch
'b
g
/mai
n
t-add-all-doc' i
n
to main
t
-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-31
Junio
C Hamano
Update draft release
n
otes to
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-31
Junio
C Ha
m
ano
Merg
e
br
a
nch 'dm/make-threaded-simplify'
commit
|
commitdiff
|
tree
2010-01-31
Dan McGee
Mak
e
NO_PTHREADS the
s
ole thre
a
d configuration variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-31
Ju
n
io C Hamano
RPM p
a
cka
g
ing:
use
%
g
lob
a
l
i
nside %
{
!?
.
.
.
}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jeff King
men
t
ion n
e
w s
h
e
ll
e
x
ec
u
tion behavior in release n
o
tes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jens Lehmann
Fix m
e
mory
l
eak in submodule
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-31
Ralf Wildenhues
Fix typos in technical docum
e
ntati
o
n
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
J
o
hn 'Wa
r
t
h
og9'
.
.
.
gitweb: Ad
d
optional extra parameter
t
o die_er
r
or,
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
John 'Warth
o
g9'
.
.
.
gitweb: add a "str
i
ng" variant of
print_so
r
t
_t
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
John 'Warthog9
'
.
.
.
gi
t
web: add
a
"st
r
ing" variant of
p
ri
n
t_lo
c
al_t
i
me
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
John
'Warthog9'
.
.
.
g
i
tweb: Check that
$
sit
e
_hea
d
er
etc
.
are defined before
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
John 'Wart
h
o
g
9'
.
.
.
gitwe
b
: Makefil
e
improvements
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
John 'Warthog9'
.
.
.
gitw
e
b
: Load checking
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Jak
u
b Na
r
ebski
gitweb: Make running t9
5
01 test wit
h
'-
-
d
e
bug' reliab
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Junio C H
a
mano
is_submodule_modifie
d
():
fix breakage
wit
h
e
xternal
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Junio C Ha
m
ano
RPM packagi
n
g:
d
on'
t
include foreign-scm-helper bits yet
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Dan McGee
gre
p
:
Fix two memo
r
y le
a
ks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Mar
k
us H
e
i
delberg
reba
s
e:
don't invoke the
p
a
g
e
r for each commit summary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Junio C Hamano
Updat
e
d
r
aft release
n
o
te
s
to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Jun
i
o C
H
amano
Merge branch 'm
a
int
'
commit
|
commitdiff
|
tree
2010-01-30
Junio C H
a
m
a
n
o
Merge branch 'mai
n
t-
1
.
6
.
5'
i
nto
m
aint
commit
|
commitdiff
|
tree
2010-01-30
Johannes Sixt
Imple
m
ent p
t
hread_con
d
_broadca
s
t on Windows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
S
e
b
astian S
c
huberth
If d
e
riving SVN_SSH from GIT
_
SSH on msy
s
, also
add
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next