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 'jk/blame-line-porcelain'
2011-05-23
Junio C Hamano
M
erg
e
branch 'jk
/
blame-line-porcelain'
commit
|
commitdiff
|
tree
2011-05-21
Juni
o
C
H
am
a
n
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2011-05-20
Jun
i
o
C H
a
mano
Update
d
ra
f
t
release notes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
J
u
nio C Ham
a
no
Merge branch 'jc/maint-1
.
7
.
4-pathspec-stdin-and-
c
mdlin
e
'
commit
|
commitdiff
|
tree
2011-05-20
J
u
nio
C
Ham
a
n
o
M
erge
b
ranch
'rg/copy-
g
ecos-username'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge branch 'jl/submodul
e
-conflicted-gitmodules'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Ha
m
ano
Merge branch '
j
c/replacing'
commit
|
commitdiff
|
tree
2011-05-20
Juni
o
C Ha
m
a
no
M
erge bran
c
h 'nd/spars
e
-co
-
fix'
commit
|
commitdiff
|
tree
2011-05-20
Junio C
H
ama
n
o
Merge branch 'ld/p4-preserve
-
u
ser
-
names
'
commit
|
commitdiff
|
tree
2011-05-20
J
u
nio C Hamano
Merg
e
b
r
anch 'ms/tagna
m
e-does-not-begin-with-dash'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge branch 'jk/g
i
t-connection-deadlock-fix'
commit
|
commitdiff
|
tree
2011-05-20
Junio C
H
amano
Mer
g
e branch 'j
s
/maint-send-pa
c
k-stat
e
less-rpc
-
deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-20
J
un
i
o C Hamano
Merge branch 'jk/cherry-pick-roo
t
-with-resolve'
commit
|
commitdiff
|
tree
2011-05-20
J
unio C Hamano
Merge bran
c
h 'jc
/
m
aint-pathspec-st
d
in-an
d
-cmdlin
e
'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge 1
.
7
.
5
.
2 in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
J
unio C
Hama
n
o
Re
v
ert
"
M
e
rg
e
branch 'e
n
/merge-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
Junio C
H
amano
Update release notes
to
1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Hamano
Merg
e
branch 'js/main
t
-1
.
6
.
6-send-
p
ack-
s
tatel
e
ss-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Merge bran
c
h 'jc
/
c
onvert'
commit
|
commitdiff
|
tree
2011-05-16
J
u
ni
o
C Hamano
M
e
r
ge branch 'ci/commit--intera
c
tive
-
ato
m
ic'
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Ha
m
ano
Merge branch 'sg/com
p
letion-update
s
'
commit
|
commitdiff
|
tree
2011-05-16
J
unio
C Hamano
Merge branch
'
k
k/main
t
-pre
f
ix-in-
c
onf
i
g-mak'
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Haman
o
M
e
r
ge branch 'mg/
m
e
rge-ff-config'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Me
r
g
e
br
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Upda
t
e
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
M
e
rge
bran
c
h 'jn/maint-format-patch-
d
oc' into
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Merge b
r
anch '
s
s/cher
r
y
-pick-x-doc' into
main
t
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C Hama
n
o
Merg
e
branch
'vr/m
e
rg
e
-base-
d
o
c' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio
C
H
a
mano
Merge
b
ra
n
ch
'sr/maint-fas
t
-import-tighten-opti
o
n-p
a
rsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jc/t1506-shell-
p
aram-expansi
o
n-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
i
o C Hamano
M
e
rge branch 'jc/fix-add-u-un
m
erged' into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Ham
a
no
M
e
rge branch 'jn/gitweb-d
e
pendency' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Hamano
Merge bran
c
h 'jc/main
t
-branch-m
e
rgeoptio
n
s' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge branc
h
'jc/ma
i
nt-add-p-
o
ver
l
apping-
h
unks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Hamano
sideband_demu
x
(): fix decl-after
-
stmt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C
H
ama
n
o
Sync
re
l
ease
n
otes for 1
.
7
.
6
t
o exclude what are in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Update draft release notes to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hamano
M
erge b
r
anch 'cn/form
a
t-patc
h
-quiet' into
m
aint
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hamano
Merge branch 'jm/mergetool
-
submodule
s
' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C H
a
mano
Merge branch '
j
k/format-pa
t
c
h
-
q
u
ote-special-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Me
r
ge
branch 'vh/git
-
svn-doc' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hama
n
o
git_open_noatime(): drop unuse
d
param
e
te
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
sha1_
f
i
l
e
: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
read_sha
1
_file(): allow selective bypas
s
ing of replacement
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
inline l
o
okup_re
p
l
a
c
e_o
b
j
e
ct()
c
al
l
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Hamano
read_sha1_
f
i
l
e(): get r
i
d of
r
ead_sha1_file_repl()
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C
H
ama
n
o
t6050: make sure we t
e
st not just commit replacement
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Declare lookup_replace_
o
b
j
ect() in cac
h
e
.
h
,
not i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
a
mano
Merge branch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Upd
a
te draft r
e
le
a
se notes to
1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'bf/c
o
m
m
it-templat
e
-no-cleanup'
commit
|
commitdiff
|
tree
2011-05-13
J
unio
C Hamano
M
e
rge branch 'jc/t
1
506
-
shell-param
-
expansi
o
n
-
gotcha'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Merge branch
'rr/rerere-libify-cl
e
a
r-
g
c'
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
i
o
C H
a
mano
Merge branc
h
'js/maint-send-
p
ack-statele
s
s-rpc-dea
d
lock
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rg
e
b
ran
c
h 'j
h
/dirstat-lines'
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C
Hamano
Merge br
a
nc
h
'jc/f
i
x-ad
d
-u-unmerged'
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Mer
g
e b
r
anch
'j
n
/setup-revisions-glob-and-friends-passthru
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Mer
g
e
b
ranch 'cn/log-pa
r
se-opt
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch
'main
t
'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Prepare for 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o
C
Hamano
Merge bra
n
ch 'aw/
m
aint-r
e
b
ase-i-p-no-ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
H
a
m
ano
Merge bra
n
c
h
'
j
s
/
blame-
p
arsename' into maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Merge branch '
g
r/cvs
i
m
p
ort-a
l
t
ernativ
e
-
c
vspass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
M
e
rge branch 'cj/p4
m
erge'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
a
n
o
Merge branch 'jk/merge-one
-
file-
w
orking-tree' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Ha
m
a
n
o
Merge b
r
anch 'jc/fix-diff-files-unmerged' i
n
to
mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
Merge branch
'mz/maint-rename-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
M
erg
e
branch 'n
d
/struct-pathspec'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hamano
Merge branch 'jc/ma
i
nt-1
.
7
.
4-p
a
thspec-stdin-and
-
c
m
dline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch 'jc/maint-1
.
6
.
6-paths
p
ec-
s
tdin
-
a
n
d-c
m
d
l
ine'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch '
j
c
/
m
aint
-
1
.
6
.
6-
p
a
thspec-stdi
n
-and-cmdline
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
Hamano
setup_r
e
visi
o
ns()
:
take pathspec from
comm
a
nd li
n
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Update draft
r
e
lease notes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hama
n
o
Mer
g
e branch 'jn
/
gitw
e
b-depen
d
ency'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
Ham
a
no
Merge branch 'jc/maint-branc
h
-mergeoptions'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hamano
Merge branch
'
jn/maint-test-merge-verify-p
a
rent
s
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Mer
g
e branc
h
'vh/conf
i
g
-interactive-singlekey
-
doc'
commit
|
commitdiff
|
tree
2011-05-11
J
unio C Hamano
Merge branch
'
jc/m
a
int-add-
p
-over
l
app
i
ng-hunks'
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o C Hamano
Merge branch 'sr/maint-fast-import-tighten-o
p
tion-parsi
n
g'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C
Haman
o
Merge
branc
h
'dm/ht
t
p-clea
n
up'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Mer
g
e
branch 'jn
/
ctags'
commit
|
commitdiff
|
tree
2011-05-10
J
u
nio C Hamano
M
e
rge branch '
f
c/comp
l
etio
n
-zsh
'
i
n
t
o
sg/compl
e
tion
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Juni
o
C Hamano
Revert "comp
l
etion: don't
d
eclar
e
'local
w
ords' to
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio
C Ham
a
n
o
R
e
v
ert
"
H
o
n
or $(prefix)
set in c
o
nf
i
g
.
mak*
w
h
e
n de
f
i
n
i
n
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Jun
i
o C
H
amano
convert: make it h
a
rder to screw u
p
adding a
conve
r
sion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Juni
o
C
Ham
a
no
convert: make it
safe
r
t
o ad
d
convers
i
on attr
i
b
utes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
J
unio
C
H
amano
conve
r
t: g
i
ve s
a
n
er names to crlf/eol
v
ariab
l
es, types
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
convert: ren
a
me the "eol"
gl
o
bal variab
l
e to "c
o
r
e_eol"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
t1507:
a
v
oid "
$
{
p
arameter
<
op>'word'}
"
inside dou
b
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hamano
t37
0
1:
add-p-fi
x
makes t
h
e last test t
o
pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio
C Hama
n
o
rere
r
e: libify rerere_clear() an
d
rerer
e
_gc()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C Ha
m
an
o
m
erge: introd
u
ce merge
.
ff configuration variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branch
'j
c
/maint-b
r
anch-mergeoptions' into mg
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio
C
Ha
m
ano
merge: make branc
h
.
<name>
.
m
e
rgeoptions
correctly override
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
U
pdate draf
t
rel
e
ase notes to
1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C Hamano
Merge branch 'jn/ru
n
-command-error-f
a
ilure'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
M
erge branc
h
'js/info-
m
an-path'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merg
e
b
r
anch
'im/
h
ashcmp-optim'
commit
|
commitdiff
|
tree
next