repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
2010-08-13
Elijah
Newren
t
5
520-pull: Add testcas
e
s
showing spurious
c
onflicts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
Junio C Hama
n
o
Git 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
Junio C Hamano
M
erge
bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2010-02-12
Jun
i
o C Ham
a
no
Fix t
y
po in
1
.
6
.
6
.
2
rel
e
ase notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
J
u
nio C Ha
m
ano
Re-
f
ix check-ref-for
m
at doc
u
mentation
m
ark-up
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
Junio C Hamano
archive
d
o
c
um
e
ntati
o
n
:
attributes ar
e
ta
k
en from the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
Michael J G
r
u
b
e
r
Docume
n
tation: min
o
r
fixes to
R
e
lNote
s
-1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
SZEDER Gábo
r
bash
:
sup
p
ort 'git am
'
s new '--continu
e
' option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
Junio C Hamano
M
erge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-02-12
Jacob Helwig
filter-bran
c
h
: Fix
err
o
r
message for --prune-e
m
pty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
Jeff Ki
n
g
am: swi
t
ch --resolved
to --c
o
ntinue
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
Junio C
H
amano
Update draft releas
e
notes to 1
.
7
.
0 one more t
i
me
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
Ju
n
i
o
C
H
aman
o
Sy
n
c
with 1
.
6
.
6
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
Junio
C
Ha
m
an
o
Git 1
.
6
.
6
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
Junio C
H
amano
Me
r
ge bra
n
ch 'm
a
int-1
.
6
.
5' in
t
o
m
a
i
nt
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
t8003: check exit c
o
de of comm
a
nd and err
o
r messa
g
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
Junio C
H
amano
Merge
b
ran
c
h
'
sp/maint-fast-import-lar
g
e-blob' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
J
u
n
i
o C Hamano
Merge branch
'gp/maint-cvss
e
rver
'
i
nto
ma
i
nt
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Merge
branch 'jc/maint-refl
o
g-
b
ad-timestamp'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Me
r
ge branch 'il/maint
-
xmallocz
'
i
n
to maint
commit
|
commitdiff
|
tree
2010-02-10
J
unio C Ha
m
ano
M
e
rge
b
ranch '
j
h
/
maint-config-file-prefix' into maint
commit
|
commitdiff
|
tree
2010-02-10
J
unio C Hamano
M
e
r
ge branch
'
n
d/include-termios-for-osol'
i
nto
m
a
i
nt
commit
|
commitdiff
|
tree
2010-02-10
Juni
o
C
H
amano
Mer
g
e
branch
'
j
c
/maint-1
.
6
.
1
-checkout-m-custom-merg
e
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hama
n
o
Me
r
ge
br
a
n
c
h 'rs/maint-archive-ma
t
ch-p
a
thspec'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Ju
n
io
C Hamano
check-re
f
-f
o
r
mat documentati
o
n: fix en
u
merat
i
on
mark-up
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
Thomas Rast
Documentation: quote
brac
e
s in {upstre
a
m
} notation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-09
Brian Gernhar
d
t
t3902: Protect agai
n
st OS X n
o
rmalization
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-09
Junio C Hamano
M
erg
e
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-02-09
Juni
o
C Hamano
Merge branch
'
maint
-
1
.
6
.
5' i
n
to maint
commit
|
commitdiff
|
tree
2010-02-09
Jay Sof
f
ian
blame: prevent a
segv when -L given s
t
art
>
EOF
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-09
J
unio C Hamano
M
erge
b
ranch 'jc/maint
-
p
u
sh
-
doc-status'
i
nto main
t
commit
|
commitdiff
|
tree
2010-02-09
J
u
n
io C Hamano
git-push: document all
the status flags
u
sed
in
t
h
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-08
Junio C Hamano
Merg
e
branc
h
'
j
c/maint-imap-confi
g
-
p
arse
'
into maint
commit
|
commitdiff
|
tree
2010-02-08
J
u
nio
C
Hama
n
o
Fi
x
pars
i
n
g of imap
.
preformattedHTM
L
and imap
.
s
slv
e
r
i
fy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-08
Jun
i
o
C Hamano
Merge branch 'jc/maint-doc
-
git
-
add-example'
i
n
t
o maint
commit
|
commitdiff
|
tree
2010-02-08
Junio
C
H
amano
git
-
add documentation: Fix
s
hell quoting example
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-08
Ni
c
olas Pitre
Revert "pa
c
k-objects: fix pac
k
g
enerat
i
on when u
s
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-07
Jun
i
o C H
a
mano
Merge git://repo
.
or
.
cz/git-
g
ui
commit
|
commitdiff
|
tree
2010-02-07
Junio C Hamano
M
erge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-02-07
René Scharfe
archive: simplify archive form
a
t gues
s
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
Je
f
f
K
i
n
g
Fix
invalid
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
d
o
c
s:
fix
f
ilter-branch example fo
r
quoted
p
aths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
B
rian Ge
r
nhardt
t9501:
Re-f
i
x ma
x
load tes
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
B
j
örn
G
ustavsson
ba
s
h: support
the --autosquash option
f
or reb
a
se
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
Junio
C
H
a
m
ano
Merge
g
it:/
/
git
.
ke
r
n
el
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2010-02-06
Br
i
an
Gernhar
d
t
t95
0
1
:
Skip testing l
o
a
d
i
f
we ca
n
't detect it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
Junio
C
Hamano
U
p
da
t
e draft
r
el
e
as
e
notes
t
o
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
Junio
C
Hamano
Merge
branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2010-02-05
W
e
sley J
.
L
anda
k
er
Update
git fs
c
k
--
f
ul
l
short description to mention
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-05
Junio C Hamano
Mer
g
e
branc
h
'jc/maint-limi
t
-note-output' into m
a
i
n
t
commit
|
commitdiff
|
tree
2010-02-05
Jun
i
o C H
a
ma
n
o
Revert
30816237 and 7e62265
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
Junio
C H
a
m
a
no
fast-import: count --max-p
a
ck-size in byt
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
N
i
colas Pitre
u
pda
t
e
g
i
t
-
repack docu
m
entation wrt repack
.
UseDeltaBaseOffse
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
Michael J Gr
u
ber
git-clean
:
fi
x
the description of the default behavi
o
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
J
u
nio C H
a
man
o
fast-
i
mport
.
c: F
i
x big-file-threshol
d
parsing
b
u
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
N
i
colas Pitre
make --
m
ax-pack-s
i
ze argu
m
ent to 'git pa
c
k-object
'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
Nicolas
Pitre
p
a
ck-object
s
:
f
ix p
a
ck generati
o
n wh
e
n using pac
k
_
s
ize_limi
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
Nico
l
as
P
i
t
re
fix multipl
e
is
s
u
e
s
with t53
0
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
J
ohn '
W
ar
t
hog9'
.
.
.
g
i
tweb:
S
implify (and f
i
x
)
c
hop_str
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-03
R
e
né Scha
r
fe
grep
:
sim
p
lify assignmen
t
of ->fi
x
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-03
Junio C Hamano
Merge
branch 'ms
/
filter-br
a
nch-submo
d
u
l
e
'
commit
|
commitdiff
|
tree
2010-02-03
J
unio C Hamano
Merge branch 'jh/g
i
tweb-caching' (ear
l
y par
t
)
commit
|
commitdiff
|
tree
2010-02-03
J
u
n
i
o C
Ham
a
n
o
Merge branch 'bw/no-python-autoconf'
commit
|
commitdiff
|
tree
2010-02-03
Junio C H
a
mano
Merge bran
c
h
'
sp/fast-import-la
r
g
e
-blob'
commit
|
commitdiff
|
tree
2010-02-02
S
hawn O
.
P
earce
Correct spe
l
ling of 'REUC' e
x
tensi
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-02
Junio C Haman
o
b
uild: make
code "-Wpointer-arith"
c
lean
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-01
Ben W
a
lton
conf
i
gure: Allow --without-python
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-01
Ben
W
alton
confi
g
u
r
e: Allow GIT_ARG_SET_PATH to
handle --without
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-01
Junio C Hamano
Merge branch 'sp/maint-fast-imp
o
rt-large-blob' into
.
.
.
commit
|
commitdiff
|
tree
2010-02-01
Shawn O
.
Pearce
fast-import
:
Stream
v
ery la
r
ge b
l
obs di
r
ec
t
l
y to p
a
ck
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-01
Pal-K
r
istia
n
E
n
gstad
git
-
p4
:
Fix sync e
r
rors due to new serve
r
vers
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-01
Jens Lehmann
U
p
da
t
es fo
r
dirty submod
u
les in release notes and use
r
.
.
.
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
/
m
aint-octopus'
i
nto ma
i
nt
-
1
.
6
.
5
commit
|
commitdiff
|
tree
2010-02-01
Junio C Ham
a
no
M
e
rge branch 'bg
/
main
t
-add
-
all
-
doc' into mai
n
t-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-31
Junio C H
a
mano
Update draft r
e
l
e
a
se notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-31
Junio C Ham
a
no
Me
r
ge
branch 'dm/
m
ake-
t
hr
e
ade
d
-sim
p
lify
'
commit
|
commitdiff
|
tree
2010-01-31
Dan McGee
Make NO_PTHRE
A
DS the sole thread c
o
nfigurat
i
on variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jun
i
o C
Hamano
RPM
p
ackaging: use %
g
loba
l
inside %{!?
.
.
.
}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jeff King
mention ne
w
s
hell
execution
beh
a
vior i
n
release note
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jens Lehmann
Fix memory le
a
k
in submodule
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-31
Ralf
Wilden
h
ues
Fix typo
s
i
n
technical do
c
u
mentation
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
John 'Warth
o
g9'
.
.
.
git
w
eb: Add optional ex
t
ra parameter to die
_
error,
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
J
o
hn 'Warthog9'
.
.
.
gitweb
:
add a "string"
v
a
r
iant of print_sort_th
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
J
o
h
n '
W
arthog9'
.
.
.
gi
t
web
:
add a "string"
va
r
iant of pr
i
nt_local_tim
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
John 'Warthog9'
.
.
.
git
w
eb: Check tha
t
$site_he
a
der etc
.
are
d
e
f
ined befo
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Jo
h
n '
W
arthog9'
.
.
.
gitweb:
M
a
kefile improveme
n
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
J
ohn 'Warthog9'
.
.
.
gitweb: Load checkin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Jak
u
b Na
r
ebski
gitweb: Make runnin
g
t9501 test wi
t
h '--d
e
b
u
g' r
e
liable
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Junio C
H
aman
o
is_submodule_modified(): fix breakage with externa
l
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Ju
n
io
C
Hama
n
o
RPM packa
g
in
g
: don't inclu
d
e foreign-sc
m
-
helper bit
s
yet
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
D
an M
c
G
e
e
g
rep: Fix t
w
o
me
m
ory
l
eaks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Markus
H
eide
l
berg
rebase: don't inv
o
ke t
h
e pager for eac
h
commit s
u
mmary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Junio
C
H
a
mano
Update dr
a
f
t
release n
o
tes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Junio C
H
amano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-30
Juni
o
C
Hamano
M
erg
e
branch
'maint-1
.
6
.
5' into
m
aint
commit
|
commitdiff
|
tree
2010-01-30
Jo
h
a
n
n
e
s Si
x
t
Imp
l
e
m
ent pt
h
read_cond_broadcast
o
n Windows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Sebastian
Sch
u
berth
If deriving SVN_SSH from
GIT_SSH on
m
sys,
also add
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-29
Junio C Ham
a
no
Merge git://git
.
kernel
.
o
r
g/pub/
s
cm/gitk/gitk
commit
|
commitdiff
|
tree
2010-01-29
Jeff King
a
d
d sheban
g
li
n
e to git-
m
ergetool-
-
lib
.
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-29
Jeff King
fix of
f
-by-one allocation er
r
or
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next