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
Merge branch 'maint'
2011-05-21
Junio C Ha
m
ano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2011-05-20
Juni
o
C Hamano
U
pdate d
r
af
t
re
l
ea
s
e
notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
uni
o
C Hamano
M
erge
branch
'jc/maint-1
.
7
.
4
-
p
athspec-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge branch
'
rg/copy
-
gecos-username
'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge branch
'jl/submodule-conflicted-gitmodules'
commit
|
commitdiff
|
tree
2011-05-20
J
u
nio C Haman
o
Mer
g
e
br
a
n
c
h
'jc/replacing'
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
Ham
a
no
Merge branc
h
'nd/sparse-
c
o
-
fix'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
M
e
rge
b
ranch 'l
d
/p4-preserve
-
u
s
e
r-names'
commit
|
commitdiff
|
tree
2011-05-20
J
unio C
Hamano
Me
r
ge branch 'ms/tagname-do
e
s-not-be
g
i
n
-with
-
dash'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge branch
'jk/git-connect
i
on-de
a
dlo
c
k-fix'
commit
|
commitdiff
|
tree
2011-05-20
Junio C H
a
mano
Merge
b
r
a
nch 'js
/
maint-send-pa
c
k-st
a
t
eless-rpc-dead
l
o
c
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-20
Juni
o
C H
a
mano
Me
r
ge branch 'j
k
/
cherry-pick-roo
t
-with-resolve'
commit
|
commitdiff
|
tree
2011-05-20
Jun
i
o C
Ha
m
a
n
o
M
erge branch 'jc/m
a
int-pathspec-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
M
erge
1
.
7
.
5
.
2 in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Ju
n
io C H
a
mano
Reve
r
t "Merge
branc
h
'en/mer
g
e-recursive'"
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Jun
i
o C Hamano
Up
d
ate releas
e
notes to
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
J
unio C Hamano
Merge branch 'js/maint-1
.
6
.
6-send-pack-stat
e
less
-
rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Me
r
ge branch '
j
c
/
c
onvert
'
commit
|
commitdiff
|
tree
2011-05-16
J
unio
C Hamano
M
erg
e
branch 'ci/commit--i
n
teract
i
v
e-atomic'
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Ham
a
n
o
Merge branch 'sg/com
p
letion-updates'
commit
|
commitdiff
|
tree
2011-05-16
J
u
ni
o
C Hamano
Merge branch 'kk/maint-prefi
x
-in
-
c
onfi
g
-mak'
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Mer
g
e bra
n
ch
'm
g
/merge
-
ff-config'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Update draft release notes to
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge br
a
nch 'jn/main
t
-format
-
patch-doc
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C
Hamano
Me
r
ge
branch '
s
s/cherry-pick-x-doc'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
rge branch 'vr/merge-base-d
o
c'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
io
C
Hamano
M
erg
e
branch 'sr
/
maint-
f
ast
-
import-tighten-o
p
t
i
on-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge br
a
nch 'jc/t
1
506-shell-pa
r
am-exp
a
nsion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Ha
m
ano
Merge branch
'jc/fix
-
add-u-u
n
merged' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
erg
e
bra
n
c
h 'jn/gitwe
b
-depe
n
dency' into maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Ha
m
ano
Merge
br
a
nch 'jc/maint-
b
r
a
nch-mergeo
p
tions' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merg
e
branch 'jc/maint-add-p-
o
v
e
rlap
p
ing-hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C
Hamano
si
d
eba
n
d_d
e
mu
x
(): fix
d
ecl-after-s
t
mt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
i
o C H
a
mano
Sy
n
c releas
e
notes for
1
.
7
.
6 to
e
x
clude w
h
at
a
re
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
U
p
date draft releas
e
notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C H
a
mano
Merge
branch '
c
n
/
format-pa
t
ch-quiet' i
n
to ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hamano
Merge branch 'jm/
m
ergeto
o
l-submo
d
ule
s
'
into
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Haman
o
Merge br
a
nch 'jk/format-patch-quote-specia
l
-in-f
r
om
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Mer
g
e branch 'vh/git-sv
n
-doc'
i
n
t
o maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
g
it_ope
n
_
n
oatime(
)
: dr
o
p unused parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hama
n
o
s
ha1_file: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C
Hamano
r
e
ad_sha
1
_file():
allow selective by
p
assing of replaceme
n
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hama
n
o
inline
l
o
o
kup
_
r
e
plac
e
_ob
j
ect() calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
re
a
d_sha1_file(): get rid o
f
read_sha1_file_repl()
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o
C Hamano
t6050: make su
r
e
w
e
t
e
st not just commit replac
e
ment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Declar
e
lookup_repla
c
e_ob
j
ect() in
c
a
ch
e
.
h, not in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Me
r
ge
branch 'maint
'
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Up
d
ate
d
r
a
ft relea
s
e notes
to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
M
erge bra
n
ch
'bf/commit-template-no-cleanu
p
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
b
ran
c
h 'jc/t
1
506-s
h
ell-param-expansion-got
c
ha'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hama
n
o
M
erge
bra
n
ch
'rr/rerere-libif
y
-c
l
ear-g
c
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Me
r
ge
branch 'js/maint-send-pack-stateless-rpc-
d
eadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
i
o
C
Ham
a
no
M
erg
e
branch 'jh/
d
irstat-lines'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
Merge bra
n
ch 'jc/f
i
x-ad
d
-
u
-unmerged
'
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
Merge branch
'
j
n/setu
p
-revisions-glob-a
n
d-frie
n
ds-passthru'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Merg
e
bra
n
ch 'cn
/
log-parse-opt'
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C
Hamano
Merge b
r
anch
'
main
t
'
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C Hamano
Prepa
r
e for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merge
b
ranch 'aw/main
t
-reb
a
se-i-p-no-f
f
' into m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-13
J
unio C H
a
man
o
Merge branch 'js/blame-parsename' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Merge branch 'gr/cvsi
m
port-alternativ
e
-cvspass-lo
c
ati
o
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Merge branc
h
'cj/
p
4m
e
rge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Merg
e
b
ranch 'jk/merge-one-file-working-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
Haman
o
M
e
rge
branc
h
'jc
/
fix-diff-fil
e
s
-unmerged' in
t
o main
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
b
ranch 'mz/maint-re
n
ame-unmerged' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Merge b
r
anch 'nd/s
t
r
u
ct-p
a
ths
p
ec'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Haman
o
Merge branch 'jc/maint-1
.
7
.
4-pat
h
spec-stdin-an
d
-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
Hamano
Merge
br
a
nch 'jc
/
maint-1
.
6
.
6-p
a
t
h
spec-stdin-and-cm
d
line'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
Hamano
Merge branch '
j
c
/
mai
n
t
-1
.
6
.
6-pathsp
e
c-
s
tdin-an
d
-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
s
e
tup_revisions()
:
t
a
ke pathspec
f
rom command
line
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io C Ham
a
no
Update draft rele
a
se
notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hama
n
o
Merg
e
branch '
j
n/gi
t
w
eb-depend
e
ncy'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hamano
Merge
b
r
anch 'jc/m
a
int-branch-mergeopt
i
ons'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Hamano
Merge bran
c
h 'jn/ma
i
nt-test-merge
-
verify
-
parents'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
M
e
r
g
e bra
n
ch 'vh/c
o
n
fig-interactive-
s
in
g
leke
y
-d
o
c'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merg
e
bran
c
h 'jc/maint-add-p-ov
e
rlap
p
ing-hunks'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch 's
r
/
maint-fast-i
m
port-ti
g
hten-option-parsin
g
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
H
amano
M
e
rge
b
ranch 'dm/http-cl
e
an
u
p'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch 'j
n
/c
t
ags'
commit
|
commitdiff
|
tree
2011-05-10
Junio C Hamano
Merge branch 'fc
/
c
o
mpl
e
tion-zsh
'
into sg/comp
l
etion
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Junio C Hama
n
o
Reve
r
t "completion: don't declare 'local w
o
rd
s
' to
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
Revert
"
Honor $(p
r
efix
)
set
in
c
onfig
.
mak* wh
e
n d
e
fin
i
ng
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C
Hamano
convert: make
i
t harder
t
o
sc
r
ew up adding a c
o
nv
e
r
s
i
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C H
a
mano
c
o
n
vert:
m
ak
e
it
safe
r
to a
d
d conversion attributes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Juni
o
C
H
amano
conver
t
: give
s
a
n
er names to crlf/eol
variabl
e
s
,
types
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C
Hamano
con
v
ert: re
n
ame
t
he
"
eol" global var
i
able to
"c
o
re_eol"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
J
u
nio C Hamano
t1507: avoid "
$
{parameter<op>
'
word'}" inside doubl
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Ha
m
ano
t3701: add-p-fix
make
s
t
he last test
to pas
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Juni
o
C Hamano
rerer
e
: libif
y
rerere_clear() and
rerere_g
c
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Ha
m
ano
merge: introdu
c
e merge
.
ff configura
t
ion variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branc
h
'jc
/
m
aint-branch-merge
o
p
t
ions' into
mg
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
merge: ma
k
e b
r
anch
.
<
n
am
e
>
.
merge
o
ptio
n
s
cor
r
ectly override
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C
H
aman
o
Upda
t
e draft re
l
ease notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio
C Hama
n
o
Merge branch 'jn/
r
un
-
command
-
error-failure'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
M
er
g
e
br
a
nch 'js
/
info
-
ma
n
-path'
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C
Hama
n
o
M
e
r
ge branch 'im/h
a
shcm
p
-optim'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
H
amano
Merge bra
n
ch '
j
k/merg
e
-o
n
e-f
i
l
e
-working-tree'
commit
|
commitdiff
|
tree
next