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
unpack-trees: fix "read-tree -u --reset A B" with conflicted index
2013-11-04
Jeff King
unpack-trees: fix "read-tree
-u --r
e
s
e
t A B"
with conflicted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-29
Jeff
K
ing
fsck
:
d
etect null sha1 in tree
e
ntri
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-29
J
e
ff King
do
n
o
t
write null
sha1s to on-disk index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-29
J
e
ff King
diff: d
o
not use null sha1 as a s
e
ntinel val
u
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hama
n
o
Git 1
.
7
.
9
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Sy
n
c with 1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Git 1
.
7
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C Ha
m
a
n
o
Sync with 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio C
H
a
mano
Gi
t
1
.
7
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Jonathan Nie
d
er
b
undle:
r
emo
v
e
stray sing
l
e-
q
uote fro
m
error mes
s
a
g
e
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 branch 'maint-1
.
7
.
8'
in
t
o maint-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
Junio C
Hamano
Merge branch 'jc/mai
n
t-verify-obj
e
c
ts-
r
emove-
p
essimi
s
m
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Ha
m
ano
Merge branch 'dw/gitweb-doc-
g
r
a
mmo' into m
a
int-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
io C Hamano
Merge br
a
nch 'tr/cache-tree' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C
Hamano
Me
r
ge
b
ran
c
h '
c
b/
m
aint
-
t
5541-make-s
e
rver
-
p
o
rt
-
portab
l
e
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Me
r
ge branch 'cn/maint
-
rev-list
-
doc' into maint
-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
i
o
C Ha
m
ano
Merge branc
h
'tr/maint-bund
l
e
-bou
n
d
ary' into
maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Juni
o
C
Hamano
Merg
e
branch 'tr/maint-bundl
e
-lo
n
g-subject' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Jun
i
o C Hamano
Merge branch '
p
h/r
e
r
e
re-
d
oc' i
n
to maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-02
Junio C Hamano
Git 1
.
7
.
9
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Ju
n
io C
Hamano
Merge branch
'jc/maint-merge
-
autoedit' into maint
commit
|
commitdiff
|
tree
2012-03-30
He
i
ko Voigt
string-list: documen
t
that stri
n
g_list_insert() inserts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Ju
n
i
o
C Hamano
Git 1
.
7
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Ju
n
io C Hamano
Merge branch 'jn/maint-fast-impo
r
t-empt
y
-ls' into maint
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Me
r
ge branch 'ph/rerere-doc
'
into maint
commit
|
commitdiff
|
tree
2012-03-26
J
u
ni
o
C Hamano
M
e
r
g
e
br
a
nch 'ms/maint-co
n
fig-error-a
t
-
e
o
l-linecount
.
.
.
commit
|
commitdiff
|
tree
2012-03-26
Mark Lo
d
ato
grep doc: add --break / --h
e
ad
i
ng
/ -W to synopsis
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Rodrigo
S
ilva (M
e
str
.
.
.
Doc
u
m
e
n
tation: improve des
c
ription o
f
GIT_EDIT
O
R an
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Nels
o
n
Benite
z
Leon
documentati
o
n: fi
x
alpha
b
etic or
d
ered
l
ist for git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
D Waitzman
D
ocumentat
i
on/gitw
e
b:
t
ri
v
ial Engl
i
s
h
fixes
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
Merge bra
n
ch 'ma
i
nt-1
.
7
.
8' into maint
commit
|
commitdiff
|
tree
2012-03-20
J
un
i
o C H
a
ma
n
o
merge: backport GIT_MERG
E
_AUTOEDIT support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
Junio C Ha
m
ano
M
e
r
ge b
r
anch
'
ks/sort-wildca
r
d
-
in-makefil
e
' i
n
to maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Juni
o
C Haman
o
Mer
g
e
branch 'jc/advise-i1
8
n' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
J
unio C
Ham
a
no
Merg
e
branch 'jn/gitweb
-
unspecified-action' into
m
aint
.
.
.
commit
|
commitdiff
|
tree
2012-03-15
Junio C Hamano
fet
c
h/receive:
r
em
o
ve over-pes
s
imistic conn
e
c
t
ivity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
J
unio C Haman
o
Git
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/mai
n
t-bundle-boundary
'
into maint
commit
|
commitdiff
|
tree
2012-03-12
Junio C
H
ama
n
o
M
erge branch 'jc/maint-diff-patch-
h
eader' into maint
By
Junio C Hamano
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Merg
e
branch 'jn/maint-do
-
not-mat
c
h-with-un
s
a
n
i
tized
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Ju
n
io C Hamano
Merg
e
branch
'jc
/
am-3-
n
onstandard-popt' into maint
commit
|
commitdiff
|
tree
2012-03-12
Martin Stenber
g
config: rep
o
rt err
o
rs at the E
O
L with correc
t
line
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-08
Phi
l
Hord
re
r
ere: Document 'rerere
r
emaini
n
g'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-06
Jakub Narebski
gitwe
b
: F
i
x fixed string (non-regexp) pr
o
j
ect search
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-06
T
h
oma
s
Rast
t5704: fix nonpo
r
tab
l
e sed/gre
p
u
s
ages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-06
Junio
C Ha
m
ano
Merge br
a
nch
'maint
-
1
.
7
.
8' int
o
maint
commit
|
commitdiff
|
tree
2012-03-06
J
unio
C Ham
a
no
Merge branch '
m
ain
t
-
1
.
7
.
7' into ma
i
nt-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-06
Thomas Rast
Docu
m
ent th
e
--histogram diff
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
J
unio C Hamano
Gi
t
1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Mer
g
e b
r
anc
h
'jc/doc
-
me
r
ge-optio
n
s' into maint
commit
|
commitdiff
|
tree
2012-03-05
Jun
i
o
C
Hama
n
o
Merge branc
h
'cn/main
t
-rev-li
s
t-doc' into maint
commit
|
commitdiff
|
tree
2012-03-05
Thomas Rast
fast-impo
r
t:
z
ero all of 'st
r
u
c
t tag' t
o
si
l
e
n
ce va
l
grind
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio C Ha
m
ano
Updat
e
draf
t
r
e
lease note
s
to
1
.
7
.
9
.
3 for the
l
ast
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Mer
g
e
b
ranch 'cn/maint-b
r
a
nch-with-
b
ad' into
maint
commit
|
commitdiff
|
tree
2012-03-05
Junio
C Hama
n
o
M
erge branch
'
jn/maint
-
gitweb-invalid
-
regexp' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Jun
i
o
C
Hamano
M
e
rg
e
branch 'nd/maint-
v
erify-objects' i
n
to
mai
n
t
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge branch
'jk/
m
aint-avoid-streami
n
g-filtered-contents
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
J
u
nio
C
H
amano
Merge b
r
anch '
j
b/fil
t
er-ignore-sigpip
e
' into
m
aint
commit
|
commitdiff
|
tree
2012-03-05
Jun
i
o C Haman
o
Merge bran
c
h '
s
p/smart-http-failure-to-push
'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2012-03-05
Junio
C
Hamano
Merge branch 'tr/maint-bundle-l
o
ng
-
subject' into maint
commit
|
commitdiff
|
tree
2012-03-05
Clem
e
ns
B
uchacher
http
.
pr
o
x
y:
als
o
mention https_p
r
o
xy and a
l
l_pro
x
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-03
Michael J
G
ruber
t0300:
wo
r
k around
bug i
n
dash 0
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-03
T
om
G
rennan
t5512 (ls
-
rem
o
te):
modernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-02
S
tefano L
a
t
tarini
tests: fix spurious error when
r
u
n dir
e
ct
l
y with Solaris
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-02
J
u
nio C
Hamano
Doc
u
ment
a
tio
n
:
do not a
s
sume that n
>
1
in <
r
e
v
>~$n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Thomas Rast
bundle: keep ar
o
und
names passed to add_pending_objec
t
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Thomas Rast
t
5
510: ens
u
re
w
e
stay in the toplevel t
e
st dir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
T
h
omas
Rast
t5
5
10
:
refactor bundle->pack
c
on
v
ersion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C
H
amano
diff -p:
squelch "diff
--git
"
header for
s
tat
-
dirty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
J
unio
C Hamano
t
4
0
1
1: illus
t
r
a
te "diff-inde
x
-p" on stat-
d
i
r
ty
p
a
t
hs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Jun
i
o C H
a
mano
t40
1
1: modernise s
t
yle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Libor
P
echace
k
Documenta
t
ion
fi
x
es in
git-conf
i
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Ca
r
l
o
s Martín Nieto
D
ocumentation: us
e
{aster
i
sk
}
in rev-list-opti
o
ns
.
txt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Jak
u
b Narebski
gi
t
we
b
: Handle inval
i
d regexp
in regexp s
e
ar
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Nguy
ễ
n
T
hái Ngọc Duy
r
ev-list:
fix
-
-verify-objects --quiet becomi
n
g --object
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Nguyễn Th
á
i Ngọc
D
u
y
r
e
v-list
:
r
emove BISECT_SHOW_T
R
IED flag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio
C Ha
m
ano
Update draft release notes to 1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Juni
o
C Hamano
M
e
rge branch 'p
j
/remote-set-branches-us
a
ge-fix' into
.
.
.
commit
|
commitdiff
|
tree
2012-02-27
Jun
i
o C Hamano
Merge bra
n
c
h 'jn/git
w
e
b-unborn-head' in
t
o maint
commit
|
commitdiff
|
tree
2012-02-27
J
u
nio C Hamano
Merge
b
ra
n
c
h
'jn/ancien
t
-meld-supp
o
rt' into
m
aint
commit
|
commitdiff
|
tree
2012-02-27
Junio C
Ha
m
ano
Merge branch 'tr/
m
erge-
e
dit-gu
i
dance' i
n
to main
t
commit
|
commitdiff
|
tree
2012-02-27
Tim Henig
a
n
CodingGuideli
n
es: do not use '
w
hich'
in sh
e
ll scripts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Tim Henigan
CodingGui
d
e
lines
:
Add a note about spac
e
s aft
e
r
r
e
directio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
C
ar
l
os Martí
n
N
i
et
o
bra
n
ch: don
'
t as
s
ume the merge
f
ilter r
e
f
exis
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Michael Hagg
e
r
t
y
post-re
c
eiv
e
-emai
l
: m
a
t
ch
u
p $LOGBEGIN
.
.
$LOGEND pairs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Michael Hagge
r
ty
p
o
st-rece
i
ve-email: re
m
ove
unused varia
b
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
J
u
ni
o
C Hamano
test: "am -3" can accept non-standard
-
p<
n
um>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
J
unio C
H
a
mano
Document
a
c
cumulated fixes since
1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Haman
o
M
erge branch 'jc/add-r
e
fresh-unmerged' into mai
n
t
commit
|
commitdiff
|
tree
2012-02-27
J
unio C Hamano
Me
r
ge
b
r
a
n
ch 'js/c
o
n
f
igure-libin
t
l'
into
maint
commit
|
commitdiff
|
tree
2012-02-27
Jun
i
o C H
a
mano
Sync with 1
.
7
.
8
.
5
commit
|
commitdiff
|
tree
2012-02-27
Junio C Ham
a
no
Git 1
.
7
.
8
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Michał
Kiedrowicz
grep -P
:
Fix matc
h
ing ^
a
n
d $
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Jim Meye
r
ing
a
m
: don't infloop f
o
r an
empty input file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Andrew Wong
r
e
base -m:
o
nly ca
l
l "notes copy" wh
e
n r
e
written exis
t
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wyckoff
git-p4: r
e
move bash-ism
i
n t9800
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete W
y
c
k
off
git-
p
4: r
e
move bash-i
s
m
i
n
t9809
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wyckoff
git-p4: fix
s
ubmit reg
r
ession with clientSpec and subd
i
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wy
c
koff
git-p4: set u
s
eClientSp
e
c vari
a
b
l
e o
n
initi
a
l
clone
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-26
Dmit
r
y
V
.
Lev
i
n
M
akefile: add thread-utils
.
h to LIB_H
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next