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
Elij
a
h Newren
t5520-
p
ull
:
Add testcas
e
s
sho
w
i
ng spurious con
f
li
c
ts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
J
u
nio C
Hamano
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
n
t
'
commit
|
commitdiff
|
tree
2010-02-12
Ju
n
io C Hamano
Fix typo in
1
.
6
.
6
.
2 re
l
ease notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Junio C
H
amano
Re-fix check-ref-
f
ormat documentation mark-up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Junio
C
Hamano
a
r
chi
v
e documentati
o
n
:
attributes are taken from the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
M
i
chael J
Gruber
Documentation: 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
bash: support 'git am's new '--c
o
ntinue' option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Junio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-02-12
Jacob Helwig
fi
l
ter-branch: Fix error message for --prune-e
m
p
ty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
J
eff King
am: swi
t
ch
--r
e
solved
t
o
--
c
o
n
ti
n
ue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Juni
o
C Hama
n
o
Update draft rel
e
ase no
t
e
s to 1
.
7
.
0
one
more tim
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Ju
n
io C Hamano
Sync with 1
.
6
.
6
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Junio
C
Hama
n
o
Gi
t
1
.
6
.
6
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
J
unio C
H
a
mano
Merge
b
r
anch 'm
a
int-1
.
6
.
5' into mai
n
t
commit
|
commitdiff
|
tree
2010-02-10
Junio C H
a
mano
t8003:
c
heck exit
c
od
e
of command and error me
s
sage
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Junio C Ham
a
no
Me
r
ge b
r
an
c
h
'sp/maint-fast
-
i
mp
o
rt-
l
a
r
g
e
-b
l
ob' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Merg
e
b
r
an
c
h 'gp/maint-
c
vsserver' into
m
a
int
commit
|
commitdiff
|
tree
2010-02-10
Junio C H
a
m
ano
Merge b
r
an
c
h 'jc/maint-reflog-ba
d
-
t
imestamp' into maint
commit
|
commitdiff
|
tree
2010-02-10
Jun
i
o C
Ha
m
ano
Merge br
a
n
ch '
i
l/maint-xmallocz' into
m
aint
commit
|
commitdiff
|
tree
2010-02-10
Junio C H
a
mano
Merge
bran
c
h
'jh/maint-co
n
fig-file-pre
f
ix' into ma
i
nt
commit
|
commitdiff
|
tree
2010-02-10
J
u
n
i
o
C Hama
n
o
Merge branch 'nd/include-termios-for-osol'
into maint
commit
|
commitdiff
|
tree
2010-02-10
J
u
nio C Hama
n
o
M
erge branch 'jc
/
maint
-
1
.
6
.
1-chec
k
out-m-custom-merg
e
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
J
u
nio C Hamano
Merge br
a
nc
h
'rs/maint-
a
rchive-matc
h
-pathspec'
into
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Junio C
H
amano
ch
e
ck-ref-fo
r
mat
document
a
tion: fix enum
e
ratio
n
mark-up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Th
o
mas Rast
D
o
c
umentation: q
u
o
te braces in {u
p
stream} n
o
t
a
ti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-09
Brian G
e
rnhardt
t3902: Pr
o
tect again
s
t
O
S
X n
o
rmalization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-09
J
u
nio C H
a
mano
M
e
r
ge branch
'maint'
commit
|
commitdiff
|
tree
2010-02-09
Junio C Hamano
Merge
br
a
nch 'ma
i
nt-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-02-09
Jay Soffian
bla
m
e: prevent a segv when -L gi
v
en
start
>
EOF
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-09
Ju
n
i
o C Hamano
Merge bra
n
ch 'jc/maint-push-d
o
c-status' in
t
o maint
commit
|
commitdiff
|
tree
2010-02-09
Junio C Hama
n
o
git-push: document all t
h
e
status f
l
ags used in
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-08
Jun
i
o C Hama
n
o
Merge branc
h
'jc/main
t
-
i
m
ap-
c
onfi
g
-pa
r
se' i
n
to maint
commit
|
commitdiff
|
tree
2010-02-08
J
u
nio C
H
a
mano
Fix pars
i
ng
o
f imap
.
pref
o
rm
a
ttedHT
M
L a
n
d
i
m
ap
.
sslverify
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-08
Junio C Hama
n
o
Merge b
r
anch 'jc/maint-doc-git
-
add-e
x
am
p
le'
i
nto
m
aint
commit
|
commitdiff
|
tree
2010-02-08
Ju
n
io
C Hama
n
o
g
i
t
-add doc
u
mentation: Fix shell qu
o
t
i
ng example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-08
Nicol
a
s Pitre
Revert "pack-ob
j
ects: fix pack generation w
h
en using
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-07
Junio C Hamano
Merg
e
git://repo
.
o
r
.
cz/git-gu
i
commit
|
commitdiff
|
tree
2010-02-07
Junio C Ha
m
ano
Merge br
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-02-07
Re
n
é Scharfe
arc
h
ive: simplify
a
rchive form
a
t g
u
essing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
J
e
ff King
Fix invali
d
read i
n
quote_c_
s
tyle_cou
n
ted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Jeff
K
ing
docs: fix
fi
l
t
e
r
-b
r
an
c
h
e
xam
p
le
for q
u
o
t
ed paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Bri
a
n Gernhardt
t9501:
R
e-fix max l
o
ad test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
B
jör
n
Gustavsson
bash: sup
p
ort the --
a
utosquash optio
n
for
r
ebase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Junio C Hamano
Merge git:
/
/git
.
ke
r
nel
.
org/pub/scm/g
i
tk/gitk
commit
|
commitdiff
|
tree
2010-02-06
Bri
a
n
G
ernhardt
t9501: S
k
ip
t
esting loa
d
i
f we can't detect it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Junio C Hamano
U
p
date dra
f
t release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Junio C H
a
mano
M
erge branch 'maint
'
commit
|
commitdiff
|
tree
2010-02-05
Wesley
J
.
Land
a
k
e
r
Update git
f
sck --ful
l
short des
c
ription to me
n
ti
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-05
Ju
n
i
o C Hamano
Merg
e
branc
h
'
j
c
/m
a
int
-
li
m
it-note-output' into
m
aint
commit
|
commitdiff
|
tree
2010-02-05
Junio C Hamano
Revert 3081623
7
an
d
7
e
6
2265
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Junio
C
Hamano
fast-impo
r
t: count --m
a
x-pack-si
z
e
i
n
by
t
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
N
i
col
a
s Pitre
upda
t
e git-repack docum
e
n
t
ation wrt
r
e
pack
.
UseDeltaBaseOffset
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Michael
J
Gruber
gi
t
-cl
e
an: fix the d
e
scriptio
n
o
f the default behavior
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Junio C Hamano
f
ast-impo
r
t
.
c: Fix bi
g
-fil
e
-thres
h
old parsing bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Nic
o
las P
i
tre
make --
m
ax-pack-size
argum
e
nt to 'g
i
t pack-object'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
N
i
colas Pitr
e
pack-ob
j
e
c
ts:
f
ix pack generation when usin
g
pack_size_limi
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Ni
c
ola
s
Pi
t
re
fix mult
i
ple issues with t53
0
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
John 'Wart
h
og
9
'
.
.
.
gitweb: Simplify (and fix) cho
p
_str
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-03
R
e
n
é
Scha
r
fe
grep: simpli
f
y
assignment of
->fixed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-03
Junio C Hamano
Merge branc
h
'ms/fil
t
er-branch-submodule'
commit
|
commitdiff
|
tree
2010-02-03
Junio C Hamano
Merge branch 'j
h
/gitweb-cac
h
ing
'
(early part)
commit
|
commitdiff
|
tree
2010-02-03
Junio
C
Hama
n
o
Merge branch 'bw/no-pyt
h
on-a
u
toconf'
commit
|
commitdiff
|
tree
2010-02-03
Junio C Hamano
Merge
branch 'sp/fa
s
t
-
import-large-blo
b
'
commit
|
commitdiff
|
tree
2010-02-02
Sha
w
n O
.
Pearce
Cor
r
ec
t
spelling of
'REUC' e
x
tensio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-02
J
u
ni
o
C Hamano
b
u
i
ld: make code "
-
W
p
ointer-ari
t
h" clean
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Be
n
Walt
o
n
configure
:
A
l
low --witho
u
t-python
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Ben
Wal
t
on
configure:
Allow GIT_ARG_S
E
T_PATH to handle -
-
wi
t
h
ou
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Jun
i
o C Haman
o
Merge branch
'
sp/mai
n
t-fast-import-larg
e
-blob' into
.
.
.
commit
|
commitdiff
|
tree
2010-02-01
Shawn
O
.
Pear
c
e
fast-import: Stre
a
m very la
r
ge blo
b
s direct
l
y to
p
ack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Pal-Kristian Engstad
git-p4
:
Fix
s
ync er
r
ors due t
o
new server version
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Jens Lehmann
Upd
a
tes for dir
t
y
s
u
bmo
d
ules in relea
s
e notes an
d
user
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Junio
C
Hamano
Merge b
r
a
n
ch
'
sb/maint-octopus' into ma
i
nt-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-02-01
Junio C Ham
a
no
Merge branch 'bg/m
a
in
t
-add-all
-
d
oc'
i
n
to maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-31
Junio C Hamano
Update d
r
aft r
e
lease notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
Juni
o
C Hamano
Mer
g
e
branch 'd
m
/make-
t
hre
a
ded-simplify'
commit
|
commitdiff
|
tree
2010-01-31
Dan McGe
e
Make
N
O_PTHREADS t
h
e sole t
h
read
configuration vari
a
ble
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
Junio
C Ha
m
a
n
o
RPM packaging:
u
se %global inside %{!?
.
.
.
}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
Jef
f
King
me
n
tion new she
l
l execution behavior in
r
e
lea
s
e notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
Jens Lehmann
Fix memory le
a
k in submodu
l
e
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
Ralf Wildenhues
Fix t
y
po
s
in technic
a
l documentation
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
John 'Warthog9'
.
.
.
g
itweb: Add optional ex
t
ra p
a
r
a
meter to die_error,
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
John
'
W
ar
t
hog9'
.
.
.
g
i
t
w
e
b
: add a "string"
v
ariant
of p
r
int_sort_th
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
John '
W
a
r
th
o
g9'
.
.
.
gi
t
web: add a "string" variant of
p
rint_local_time
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Jo
h
n
'
W
a
r
thog9'
.
.
.
gitw
e
b: Check that $
s
ite_header
e
tc
.
are d
e
fined befor
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Joh
n
'Wa
r
thog
9
'
.
.
.
g
itweb: Makefile improvements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
John 'Wart
h
o
g9
'
.
.
.
gitweb:
Load checking
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Jakub Narebski
gitweb: Ma
k
e running t9501 test
w
it
h
'--debug
'
r
e
l
iable
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Junio C Hamano
is_submo
d
ule_
m
odified(): fix b
r
eakage w
i
th external
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Junio C Hamano
RPM packaging: don't include
foreign-scm-helper bits yet
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
D
a
n
M
c
Gee
grep: Fix two memory leaks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Mark
u
s H
e
i
d
elberg
rebase
:
d
o
n't invoke the pager for ea
c
h c
o
m
m
i
t summary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Juni
o
C Hamano
Update draft r
e
l
ease note
s
to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Ju
n
io C Haman
o
Merge b
r
a
n
ch '
m
ai
n
t
'
commit
|
commitdiff
|
tree
2010-01-30
Junio C Hamano
Me
r
ge branch 'maint-1
.
6
.
5
'
int
o
m
a
int
commit
|
commitdiff
|
tree
2010-01-30
Johannes Sixt
Implement pthread
_
cond_broadcast
on Windo
w
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Sebastian Sc
h
uberth
If de
r
i
ving SVN_SSH from GIT_
S
SH on msys, al
s
o add
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-29
J
unio
C Hamano
M
erge git:/
/
git
.
kernel
.
org/pub/scm
/
g
i
t
k/gitk
commit
|
commitdiff
|
tree
2010-01-29
Jeff King
a
dd s
h
ebang line
to
g
i
t-mergetool--lib
.
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-29
J
eff King
fi
x
off-by-o
n
e allocati
o
n error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next