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
pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches
2010-08-13
Elij
a
h N
e
w
ren
pull --r
e
base: Avoid s
p
urious conflicts a
n
d reapplying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Elij
a
h Newren
t5
5
20-pull: Add test
c
ases showing spu
r
i
o
us
c
onfli
c
ts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
Junio C Ha
m
a
n
o
Git 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
J
u
nio C Hamano
Merg
e
branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2010-02-12
Junio C
Ham
a
no
Fi
x
t
y
po in 1
.
6
.
6
.
2 rel
e
a
s
e
n
otes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
Ju
n
io C Hamano
Re-fix check-ref
-
fo
r
mat documentation
m
a
rk-up
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
Junio C Ham
a
no
a
rchive doc
u
mentatio
n
: attributes are tak
e
n from
the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
Mi
c
hael J Gruber
D
ocumentatio
n
: mi
n
or fixes to RelNot
e
s-1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
SZEDER Gábor
bas
h
:
s
up
p
ort 'git am's new '--c
o
ntin
u
e'
optio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
Junio C
H
amano
Merge branc
h
'maint
'
commit
|
commitdiff
|
tree
2010-02-12
J
a
co
b
Helwi
g
filte
r
-branch: Fix err
o
r mess
a
ge for --p
r
une-empty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
Jef
f
King
am: switch
-
-r
e
sol
v
ed to
--continue
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Update
d
raf
t
release
n
ote
s
to 1
.
7
.
0 one mo
r
e time
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
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 Ham
a
no
Git 1
.
6
.
6
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
Junio C Ha
m
ano
Merge branch 'maint-1
.
6
.
5' into
maint
commit
|
commitdiff
|
tree
2010-02-10
Ju
n
io
C
Hama
n
o
t
8
003: check exit code of com
m
an
d
an
d
err
o
r message
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
Jun
i
o C Hamano
Merge
b
ra
n
ch
'sp/main
t
-fa
s
t-import-lar
g
e-blob' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Merge branch
'gp/maint-cvsserver
'
into maint
commit
|
commitdiff
|
tree
2010-02-10
Ju
n
io C
Hamano
Merge bra
n
ch
'jc/maint-refl
o
g
-bad-ti
m
estamp' into maint
commit
|
commitdiff
|
tree
2010-02-10
J
u
nio C Haman
o
Merge
b
ranch 'il
/
maint-xmallocz' into maint
commit
|
commitdiff
|
tree
2010-02-10
Ju
n
io
C Hamano
Merge branch 'j
h
/m
a
i
n
t-config-file-pre
f
ix' into ma
i
nt
commit
|
commitdiff
|
tree
2010-02-10
Junio C Ha
m
ano
Merge branch
'
nd/in
c
lude-termios-for-o
s
ol
'
into maint
commit
|
commitdiff
|
tree
2010-02-10
Junio
C Hamano
Merge branc
h
'j
c
/mai
n
t-1
.
6
.
1
-chec
k
out-m-custo
m
-merge
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Junio C
Hamano
Merge
branch 'r
s
/main
t
-archive-match-
p
athsp
e
c'
into
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Ju
n
i
o
C Hama
n
o
check-ref-forma
t
documentati
o
n: fix enumerat
i
on m
a
rk-up
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
Thom
a
s
Rast
Documentation: quote brace
s
in {upstream} notat
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-09
Br
i
an Ger
n
hard
t
t3902: Protect
a
gainst OS
X
normaliza
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-09
Jun
i
o C H
a
mano
Merge branch
'
m
a
i
n
t'
commit
|
commitdiff
|
tree
2010-02-09
Juni
o
C
Hamano
Merge
branch 'maint-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-02-09
J
ay Soffian
blame: prevent
a
segv when -L
g
iven st
a
rt > E
O
F
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-09
Junio C
H
ama
n
o
Mer
g
e
b
r
a
nch 'jc/
m
aint
-
push-doc-s
t
atus'
i
nto maint
commit
|
commitdiff
|
tree
2010-02-09
Ju
n
io C Hamano
git-push: document all
the status
f
l
ags use
d
i
n
the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-08
Junio C Hamano
Me
r
ge branch 'jc/m
a
int
-
imap-config-parse' into ma
i
nt
commit
|
commitdiff
|
tree
2010-02-08
Ju
n
io C
H
a
m
a
no
Fix parsi
n
g o
f
ima
p
.
pr
e
formattedHTML
a
nd imap
.
sslverify
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-08
Junio C Haman
o
Merge branc
h
'jc/ma
i
n
t-doc-git-add
-
examp
l
e'
i
n
to maint
commit
|
commitdiff
|
tree
2010-02-08
Junio C
H
amano
git-add docume
n
t
a
tion
:
F
ix shell
q
u
o
ting examp
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-08
Nicolas Pitre
R
e
vert "p
a
ck-objects:
fix pack gener
a
t
i
o
n when u
s
in
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-07
Junio C Ham
a
no
Me
r
ge
gi
t
://re
p
o
.
or
.
cz/git
-
gui
commit
|
commitdiff
|
tree
2010-02-07
Junio C
H
a
mano
Merge
b
ran
c
h
'maint'
commit
|
commitdiff
|
tree
2010-02-07
René Scharfe
a
rchive: simplify
archive f
o
rmat gue
s
sing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
Jeff King
Fix invalid
read in quot
e
_c_style_count
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
Jef
f
King
docs: fix filter-
b
ra
n
ch exam
p
le for qu
o
te
d
p
ath
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
Brian Gernhardt
t9501: Re
-
fix max load tes
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
B
j
örn Gustavsson
bas
h
:
s
upport the --autos
q
uash
o
ption for
reba
s
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
Junio
C
H
amano
Merge git://git
.
k
e
r
nel
.
org/pub/
s
cm/git
k
/gitk
commit
|
commitdiff
|
tree
2010-02-06
Bri
a
n
G
ernhard
t
t9501: Skip testing lo
a
d if we can't de
t
ect it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
Junio C Hama
n
o
U
pd
a
te
draft release
notes to
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
Jun
i
o
C Hamano
Merg
e
branch
'
m
a
i
nt'
commit
|
commitdiff
|
tree
2010-02-05
Wesl
e
y
J
.
Lan
d
aker
Up
d
ate git fsck --full short d
e
s
cription to men
t
ion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-05
Junio
C Hamano
Merge branch 'jc/maint-limit-no
t
e
-
output' i
n
to maint
commit
|
commitdiff
|
tree
2010-02-05
Junio C Ha
m
ano
Re
v
ert 3081
6
237
and
7e622
6
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
Junio C Haman
o
f
a
st-import
:
count --max-pack-size in bytes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
Ni
c
o
l
a
s
Pitre
update git-repack documentati
o
n wrt repac
k
.
UseDeltaBa
s
e
Of
f
set
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
Mi
c
hael J Gruber
git-cle
a
n: fix t
h
e descript
i
on
o
f the d
e
fault be
h
av
i
or
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
Junio C Hamano
f
a
st-import
.
c:
Fix
big-fi
l
e
-thr
e
s
h
old parsing
bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
Nicola
s
Pi
t
re
make --max-pack-size argument to
'git
p
ack-object'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
Nicola
s
Pitre
pack-objects: fix pack generation w
h
en us
i
n
g
pack_size_l
i
mi
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
Nicolas Pitr
e
fix mu
l
tiple
issues with t
5
300
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
John '
W
arth
o
g9'
.
.
.
g
i
tweb: Simplify (and f
i
x) ch
o
p_str
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-03
René Scharfe
gre
p
: s
i
mpli
f
y ass
i
gnment of ->fixed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-03
Ju
n
io C Hamano
Merge
branch
'ms/fil
t
er-branch-submodule'
commit
|
commitdiff
|
tree
2010-02-03
Ju
n
io C Hamano
Me
r
ge branch '
j
h/gitweb-cachin
g
' (early par
t
)
commit
|
commitdiff
|
tree
2010-02-03
J
u
nio C Hama
n
o
Merge branch 'bw/no-python
-
autoconf'
commit
|
commitdiff
|
tree
2010-02-03
Junio
C
Hamano
Me
r
ge branch 'sp/fast-import-large-blob'
commit
|
commitdiff
|
tree
2010-02-02
Shawn O
.
Pea
r
ce
C
orrect spel
l
ing of 'REUC' extension
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-02
Junio C Haman
o
build: m
a
ke
c
ode
"
-
W
p
ointer-arith" clea
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-01
Ben Walton
configu
r
e:
Allow --witho
u
t
-
p
y
t
hon
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-01
B
e
n Walton
configure:
A
llow GIT_ARG_S
E
T_PATH
to han
d
le
--w
i
thout
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-01
Junio C Ha
m
a
n
o
Merge branch 'sp/maint-fas
t
-impo
r
t-large-blob' into
.
.
.
commit
|
commitdiff
|
tree
2010-02-01
Shawn O
.
P
ear
c
e
fast-import
:
Stream
v
ery
l
arge bl
o
bs dire
c
tly
to p
a
ck
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-01
Pal-Kristian Engstad
git-p4: Fix sync
e
r
r
ors due to
n
ew serve
r
version
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-01
Jens Lehmann
Updates for
dirty submodules in release note
s
and user
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-01
Junio C
H
ama
n
o
M
e
r
ge branch 'sb/
m
a
int-octopus' in
t
o maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-02-01
Ju
n
i
o
C
H
a
mano
Merg
e
branch 'bg/maint
-
a
dd-all-do
c
' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-31
Junio C Hamano
Updat
e
draft release notes
to
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-31
Junio C Hamano
Merge branch 'dm/ma
k
e
-
threaded-simplify'
commit
|
commitdiff
|
tree
2010-01-31
Dan
M
cGee
Make NO
_
PTHREADS the s
o
le thread configuration
variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jun
i
o C Hamano
RPM packaging
:
use %global inside
%
{
!
?
.
.
.
}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jeff King
mention new shell execution behavior i
n
r
elease no
t
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-31
Je
n
s Lehmann
Fix memo
r
y leak in submodule
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-31
R
alf
Wildenhue
s
F
i
x typ
o
s in technica
l
d
o
cumentation
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
J
o
hn 'Warth
o
g9'
.
.
.
gitweb:
Add optiona
l
e
x
tra para
m
eter to
die_error,
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
John
'
Warthog9'
.
.
.
gitweb: add a "s
t
ring" v
a
riant of
p
r
int_sort_th
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
J
ohn 'Warthog9'
.
.
.
g
itw
e
b
:
add a
"st
r
i
ng" variant of p
r
int_local
_
time
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
John 'Warthog9'
.
.
.
gitweb: Check tha
t
$site_header etc
.
are defined be
f
ore
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
John 'Warthog9'
.
.
.
gitweb: Makefile improvem
e
nts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
John 'W
a
rthog9'
.
.
.
g
itw
e
b: Lo
a
d che
c
king
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Jakub Narebski
gitwe
b
:
Make runn
i
ng
t9501 test
with '
-
-de
b
ug' re
l
iable
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Junio C Ha
m
ano
is_submod
u
le_modified(): f
i
x
breakage with external
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Jun
i
o C
H
amano
RPM packaging:
don't include
f
ore
i
gn-scm-h
e
l
per bits yet
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Dan McGee
grep: Fi
x
t
wo memory leaks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Markus
H
eidelberg
rebase: don't invoke the pager for each commit s
u
m
m
a
ry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Junio C Hamano
Up
d
a
te draft release no
t
e
s
to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Junio C Ham
a
no
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-30
Ju
n
io C Ha
m
ano
Merge b
r
an
c
h '
m
ai
n
t
-1
.
6
.
5'
into maint
commit
|
commitdiff
|
tree
2010-01-30
Johannes Sixt
Implem
e
nt p
t
hread_con
d
_broa
d
ca
s
t on Windows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
S
e
bas
t
ian Schuberth
If deriving SVN_SSH fro
m
GIT_
S
SH
on msys,
also add
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-29
Junio C
Hamano
Me
r
ge
g
it:
/
/git
.
kerne
l
.
o
r
g/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2010-01-29
Je
f
f King
ad
d
s
heb
a
ng line to git-mergetool--l
i
b
.
s
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next