repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
unpack-trees: fix "read-tree -u --reset A B" with conflicted index
2013-11-04
J
e
f
f
King
un
p
ac
k
-trees: fix "read-tree
-u --reset A B" with conflicte
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-29
Jeff King
fs
c
k: detect nul
l
sha1 in tre
e
entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-29
J
e
f
f Kin
g
d
o
not writ
e
null s
h
a1s
t
o on-dis
k
i
n
dex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-29
Jeff
K
i
n
g
dif
f
: do n
o
t
use null sh
a
1 as a s
e
ntinel value
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C
Hamano
Git 1
.
7
.
9
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
io C Hamano
Sync with 1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Junio C Haman
o
Git 1
.
7
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Syn
c
w
i
th 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Git 1
.
7
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Jon
a
tha
n
Nied
e
r
bu
n
dle: remov
e
stray
single-quo
t
e
from
e
rror m
e
ssage
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Junio C Hamano
Merge bran
c
h 'maint-1
.
7
.
8'
into maint-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
io C Hamano
Merge branch '
j
c/maint-verify-o
b
jects-remo
v
e-pessi
m
ism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Ha
m
a
no
Merge branch 'd
w
/
g
i
tweb-doc
-
g
r
a
m
mo
'
i
nto maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C
Hamano
Merge
b
ranch 'tr
/
c
ache-t
r
ee' in
t
o
m
aint-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
io C Hamano
M
e
rge
b
r
an
c
h 'c
b
/maint-t5541-make-server-port
-
portable
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merg
e
branch
'
cn
/
maint-rev
-
list-doc' int
o
main
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
J
unio C Ham
a
no
M
erge br
a
nch 'tr/maint-bundle-boundary' in
t
o main
t
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
u
ni
o
C Hamano
Merg
e
branch 't
r
/maint-bundle-l
o
n
g-subj
e
ct'
i
nto maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C H
a
mano
Merge branch 'ph/rer
e
re-doc' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-02
Junio C Ham
a
no
Git 1
.
7
.
9
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Junio C Hamano
Merge b
r
anch 'jc
/
m
a
int-merge-aut
o
edit' into ma
i
n
t
commit
|
commitdiff
|
tree
2012-03-30
H
e
i
k
o Voigt
string
-
li
s
t: document that
s
tri
n
g
_list_
i
n
s
e
rt() insert
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Git 1
.
7
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio C H
a
ma
n
o
Merge
b
ranch
'
jn/maint-fast-import-empty-
l
s' into
m
aint
commit
|
commitdiff
|
tree
2012-03-26
Junio
C
Haman
o
Me
r
ge branch 'ph/rere
r
e
-
doc' into maint
commit
|
commitdiff
|
tree
2012-03-26
Juni
o
C Hamano
Merge branch 'ms/
m
aint
-
con
f
ig-error-at-eol-linecount
.
.
.
commit
|
commitdiff
|
tree
2012-03-26
Mar
k
L
o
d
ato
grep doc: add --break / --heading / -W to synopsis
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Rodrigo Si
l
va (Mestr
.
.
.
Doc
u
mentation: impro
v
e de
s
c
riptio
n
of GIT_
E
D
ITOR
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Nelson Benitez Leon
document
a
tion: fix
a
l
phabetic ordered list for git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
D Wai
t
zman
Do
c
ument
a
t
ion/gitweb: t
r
ivial English
fixes
commit
|
commitdiff
|
tree
2012-03-20
Junio
C H
a
mano
Merge branc
h
'maint-1
.
7
.
8' into mai
n
t
commit
|
commitdiff
|
tree
2012-03-20
Junio
C
Hamano
mer
g
e
:
backport GIT_MER
G
E_
A
UTOE
D
IT support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
Junio
C Hamano
Merge
b
r
an
c
h '
k
s/sort-w
i
l
d
c
ard-in-makefile' into main
t
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio C H
a
man
o
M
e
rge branch 'jc/advise-i18n' in
t
o maint-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Ju
n
io C
Hamano
Merge branch 'j
n
/gitweb-unsp
e
ci
f
ied-
a
ction' into mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-03-15
Junio C
H
amano
fetch/
r
ec
e
ive:
r
emove over
-
pessimistic conne
c
tivity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Junio C Ham
a
n
o
Gi
t
1
.
7
.
9
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Merge branch 'tr/maint-bun
d
l
e-boundary' int
o
maint
commit
|
commitdiff
|
tree
2012-03-12
J
unio C
Hamano
Merge branch
'j
c
/
ma
i
n
t
-dif
f
-pat
c
h-h
e
ader' into m
a
int
By
Junio C Hamano
commit
|
commitdiff
|
tree
2012-03-12
Junio C
H
ama
n
o
M
e
rge bra
n
ch '
j
n/main
t
-do
-
not-ma
t
ch-with-unsanitiz
e
d
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Jun
i
o C Hamano
M
e
rge
b
ranc
h
'jc/am-3-n
o
nstanda
r
d
-
po
p
t'
into maint
commit
|
commitdiff
|
tree
2012-03-12
Marti
n
St
e
nberg
config: report er
r
ors at th
e
EOL with correct line
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-08
Phil Hord
rerere: Docu
m
ent
'rerere remaini
n
g'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-06
Jakub
Nar
e
bski
git
w
eb: Fix
fixed stri
n
g
(
non-regexp) proj
e
ct search
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-06
Thomas R
a
st
t5
7
0
4
: fix nonp
o
rta
b
le sed/
g
rep u
s
a
ges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-06
Junio C Hamano
Merge branch 'maint-1
.
7
.
8'
into maint
commit
|
commitdiff
|
tree
2012-03-06
Juni
o
C Ha
m
ano
Merge branch 'maint-1
.
7
.
7
'
into
m
ai
n
t-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-06
Thomas
Rast
Document t
h
e --histo
g
ram
diff opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
io
C
Hamano
Git 1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
J
unio C H
a
mano
Me
r
ge branch 'jc/
d
oc-m
e
rge-
o
pti
o
n
s' into
m
aint
commit
|
commitdiff
|
tree
2012-03-05
Junio
C
Ha
m
a
no
Merge branch '
c
n/maint-rev-lis
t
-doc' into
m
aint
commit
|
commitdiff
|
tree
2012-03-05
Tho
m
as Rast
fas
t
-import: zero all of '
s
t
r
uct tag' to silence valgrind
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hama
n
o
U
p
date
draft release notes to 1
.
7
.
9
.
3 for the
last
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
io C Hamano
Merge branch
'
cn
/
maint-branch-with-bad' into mai
n
t
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
i
o
C Hamano
M
er
g
e bran
c
h 'jn/maint-gitweb-invalid
-
regex
p
' into
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
J
u
nio
C Ha
m
ano
Me
r
ge b
r
anch 'n
d
/maint-veri
f
y-o
b
j
e
c
ts' into main
t
commit
|
commitdiff
|
tree
2012-03-05
Junio
C Hamano
Mer
g
e
branch 'jk/maint
-
avoid-s
t
rea
m
ing-f
i
ltere
d
-
c
ontents
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
M
erge branch 'jb/filter-ignore
-
sigpipe' into maint
commit
|
commitdiff
|
tree
2012-03-05
Jun
i
o C Hamano
Mer
g
e b
r
anch 'sp/smart-http-
f
ailure-to-push
'
into
maint
commit
|
commitdiff
|
tree
2012-03-05
Junio
C Ha
m
a
n
o
M
e
rge branch
'
tr/maint-bundle-
l
ong-subject'
into
main
t
commit
|
commitdiff
|
tree
2012-03-05
Cl
e
mens Buchac
h
er
ht
t
p
.
pro
x
y: also men
t
io
n
https_pr
o
xy and a
l
l_proxy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-03
Mich
a
el J Gruber
t03
0
0: w
o
rk aro
u
nd
b
ug in da
s
h 0
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-03
Tom Gren
n
an
t5512
(l
s
-remot
e
):
m
odernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-02
St
e
fan
o
L
attar
i
ni
t
ests: fix spuriou
s
error when run direc
t
ly
with Solar
i
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-02
Junio
C
H
amano
Docum
e
ntation: do not assume that n >
1
in <
r
ev>~
$
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Thomas Rast
bundle
:
keep around names passed to add_pend
i
n
g
_object
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Thomas Rast
t55
1
0
: en
s
ure we stay in the t
o
plevel test dir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Thomas Rast
t
5510: refa
c
to
r
bundle->
p
ack conversion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Hamano
d
iff -p: squelch "
d
if
f
--git" header
f
or stat
-
d
i
rty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Ju
n
io
C
Hama
n
o
t4011: illustrat
e
"diff-index -p" on sta
t
-dirty paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C H
a
m
ano
t
4011: m
o
dern
i
se
sty
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Libor Pe
c
hacek
Documentation fixes in
g
it-con
f
ig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Carlos Martín Ni
e
t
o
D
ocumentation:
use
{asterisk}
i
n rev-list-options
.
t
x
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Jakub Narebski
gitweb:
Han
d
le
i
nva
l
id regexp in regexp search
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Nguyễn Thái Ngọc
D
uy
rev-list:
fix --verify-ob
j
ects -
-
qu
i
et becoming --objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Nguyễn T
h
ái Ng
ọ
c Duy
rev-
l
ist:
remove BISECT_SH
O
W
_TRIED flag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Juni
o
C
Hamano
Up
d
ate draft
r
elease no
t
es to 1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Ha
m
a
n
o
Merge branch
'
p
j
/remote-set-b
r
anc
h
es-us
a
ge-fi
x
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-02-27
Junio
C Hamano
Merg
e
branch 'jn/gitweb
-
u
n
born-head' into maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C H
a
ma
n
o
Merge
branch 'jn/ancient-meld-support' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2012-02-27
Ju
n
io C Hamano
Merge bra
n
ch 'tr/mer
g
e-ed
i
t-guid
a
nc
e
' into
m
a
i
nt
commit
|
commitdiff
|
tree
2012-02-27
Tim Henigan
CodingGuidelines: do not use 'whic
h
'
in
s
hell scripts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
T
im
Henigan
C
o
dingGuide
l
ine
s
:
A
dd a note about spaces after red
i
rection
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Carlo
s
Ma
r
t
ín
N
iet
o
bran
c
h: don
'
t assume
t
he merge filte
r
ref
e
xi
s
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Michael
Haggerty
p
o
st-r
e
ceive-email: match up
$
L
OGBEGIN
.
.
$LOG
E
ND pairs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Mi
c
h
a
el
H
aggerty
post-receive-ema
i
l: remove u
n
used
variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Ham
a
no
test:
"am -3" ca
n
accept non-standard
-
p<num>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
J
u
n
io C
H
amano
Docum
e
nt accumulated fix
e
s since 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
M
e
r
g
e branch '
j
c/add-refres
h
-unmerged'
i
nto maint
commit
|
commitdiff
|
tree
2012-02-27
J
unio C Hamano
Merge
branch 'js/configure-l
i
b
i
ntl'
into mai
n
t
commit
|
commitdiff
|
tree
2012-02-27
Jun
i
o C Ha
m
ano
Sync with 1
.
7
.
8
.
5
commit
|
commitdiff
|
tree
2012-02-27
Junio
C Hamano
Git 1
.
7
.
8
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Michał
K
iedrowic
z
grep -P: Fi
x
ma
t
ching ^ and $
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Jim M
e
yer
i
ng
am: don't
infloop
for an empty inp
u
t fi
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
A
n
d
rew Wong
reba
s
e
-m: only ca
l
l "n
o
tes copy" when rewritten
exists
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete W
y
c
ko
f
f
gi
t
-
p
4
:
remove bash-ism in t9800
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wyc
k
off
git-p4: r
e
mov
e
bash-ism
in t
9
809
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wyckof
f
g
i
t-p4: fix submit regressio
n
with
c
lientSpec an
d
subdir
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wyc
k
off
git-p4: set useClientSpec vari
a
bl
e
o
n
in
i
tial clone
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-26
Dmi
t
ry V
.
Levin
M
a
kefile: add thread-u
t
ils
.
h
to LIB
_
H
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next