repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jl/submodule-conflicted-gitmodules'
2011-05-20
Junio C Hamano
Merge
branch 'jl/submodule-conflict
e
d-git
m
odules'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Me
r
ge branc
h
'jc
/
replacing'
commit
|
commitdiff
|
tree
2011-05-20
Junio C
Hamano
Merge branch 'nd/spa
r
se-co-fix'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Ha
m
an
o
Merg
e
branch 'ld/p4-preserve
-
use
r
-names'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Haman
o
Merge bra
n
ch 'm
s
/tagn
a
me-does-not
-
begi
n
-with-dash'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge bran
c
h
'jk/git-co
n
nection-d
e
adlock-fix'
commit
|
commitdiff
|
tree
2011-05-20
Juni
o
C Hamano
Merge branch
'
js/m
a
int-
s
end-p
a
ck-stateless-
r
pc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-20
Junio C Ham
a
no
Merge bran
c
h
'j
k
/cher
r
y
-pick-root-with
-
resolve
'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
M
e
rge branch 'jc/maint-pathspec-stdin-and-c
m
dl
i
ne'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Haman
o
Merge 1
.
7
.
5
.
2 in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Junio C H
a
mano
Re
v
ert "Merge branch '
e
n/merge-recursive'"
commit
|
commitdiff
|
tree
2011-05-20
Jun
i
o C Ha
m
ano
Git
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Hamano
Update release
n
otes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Hamano
Merge branch 'js/maint-1
.
6
.
6-send-pac
k
-stat
e
less-rp
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
Merge branch 'jc/conv
e
rt'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
Merge branch
'
ci/commi
t
--interactive-atomic'
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io
C Hamano
M
e
rge branch
'sg/completion-up
d
ates'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Mer
g
e
branch 'kk/ma
i
n
t
-
pre
f
ix-in-conf
i
g-mak'
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Merge bran
c
h 'mg/m
e
rge
-
ff-config'
commit
|
commitdiff
|
tree
2011-05-16
Junio
C H
a
mano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
a
m
a
no
Up
d
ate dr
a
ft relea
s
e notes to
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
am
a
n
o
Merge
bra
n
c
h
'jn/maint-format-p
a
tch-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merg
e
branch
'
ss/cherry-pi
c
k-x-
d
oc' into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'vr/me
r
ge-base-d
o
c' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio C
H
amano
Merge bra
n
c
h
'sr
/
m
a
i
nt
-
f
a
st-import-tig
h
ten-option
-
parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
M
e
r
ge branch
'
jc/t1506-shell-param-expans
i
on-go
t
cha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Ha
m
a
n
o
M
e
rg
e
branch 'jc/
f
ix-
a
d
d
-u-unme
r
g
e
d'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merg
e
branc
h
'
j
n/gitweb-
d
ependency' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
Merge
b
ranch 'jc/main
t
-branch-mergeo
p
tions' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
M
erge branch 'jc/mai
n
t-add-p-overl
a
pping-
h
unks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
s
id
e
band_demux(): fix decl-after-
s
tmt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
S
ync
r
elease notes for 1
.
7
.
6
t
o
exclude
what are
i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
M
e
rge branc
h
'
m
a
int'
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
U
p
date
d
r
aft relea
s
e notes to
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'cn/format-
p
atch-quiet' into m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge
b
ra
n
ch 'jm/mergetoo
l
-submodules' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hamano
Merge bran
c
h 'jk/format-patch-qu
o
te-
s
p
ecial
-
in-f
r
om
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
Merge branch 'vh/git-svn-do
c
'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Ham
a
no
gi
t
_
open_noatime(): d
r
op
u
nused par
a
meter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C
Hamano
sha1_file: ty
p
ofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
aman
o
read
_
sha1
_
file(
)
: allow sel
e
ctive b
y
passing of replacement
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Hamano
in
l
ine lo
o
kup_replace_object() calls
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
read
_
sh
a
1_file
(
): get rid of
r
ead_
s
ha1_file_repl()
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Hamano
t6050: make s
u
re
w
e te
s
t
not just commit replacement
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o
C
H
amano
Declare
l
ookup_replace_ob
j
ect() in cache
.
h, not in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
a
mano
Upd
a
te draft release notes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Merge branch 'b
f
/commit-template-no-
c
leanup'
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
io
C Ha
m
ano
Merge
b
ranch 'jc
/
t1506-shell-param-exp
a
nsion-gotc
h
a'
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Merge
branch 'rr
/
rerere-libify-clear-g
c
'
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
i
o
C Hamano
Merge
br
a
nch 'js/maint-send-pack-statel
e
ss-rpc-deadlo
c
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Ham
a
no
Merge bran
c
h 'jh/d
i
rstat-l
i
nes
'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Ha
m
ano
Merge branch 'jc/fix-add-u-
u
nmerged
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch '
j
n/setup-revisions-gl
o
b-an
d
-
f
riends-passthru'
commit
|
commitdiff
|
tree
2011-05-13
J
unio
C Hamano
Merge branch 'cn
/
log-
p
a
rse-opt'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
branch
'
maint'
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
Hamano
Prep
a
re for 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hama
n
o
Merge
branch '
a
w/maint-r
e
base-i
-
p
-no-ff' into main
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merg
e
br
a
nch
'
js/blame
-
pa
r
sename' into maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C
Hamano
Merge branch 'gr/cv
s
import-alternati
v
e-
c
vspass-loca
t
ion
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
H
a
mano
Merge bran
c
h 'cj
/
p4me
r
g
e
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
Merge branch 'jk/merge-one-
f
ile-working-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Merge branch
'jc/fix-d
i
ff-fil
e
s-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Ha
m
ano
Merg
e
branch 'mz/maint
-
re
n
a
m
e-unmerged' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
J
u
ni
o
C
Hamano
M
erge branch 'nd/struct-p
a
t
h
s
pe
c
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch
'
j
c/maint-1
.
7
.
4-
p
aths
p
ec-stdin-and-cmdl
i
ne'
commit
|
commitdiff
|
tree
2011-05-11
J
unio C Haman
o
Mer
g
e branch 'jc/maint-1
.
6
.
6-pathspec-s
t
din-and-cmdline
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ham
a
n
o
s
e
t
up_rev
i
s
i
o
n
s():
t
ake pathspec fr
o
m command li
n
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ha
m
ano
Update draft
releas
e
n
o
tes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio C
H
amano
Merge br
a
n
ch 'j
n
/gitweb-dependency'
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o
C Hama
n
o
Merge branch 'jc/m
a
int-bran
c
h-
m
ergeoption
s
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
H
a
mano
M
erge branch
'
jn/maint-t
e
st-mer
g
e-verify
-
parents
'
commit
|
commitdiff
|
tree
2011-05-11
J
unio C Hama
n
o
Merge
bran
c
h 'vh/co
n
fig
-
i
nteractive-singl
e
key-do
c
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
Hamano
M
e
rge branch
'
jc/maint-add-
p
-overlapping-hun
k
s'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Ha
m
ano
Merge branch
'
sr/m
a
int-fas
t
-im
p
or
t
-t
i
ght
e
n-option-par
s
ing'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ha
m
a
no
Merge branch 'd
m
/http-cleanup'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ha
m
ano
Me
r
ge branch 'jn/ctags'
commit
|
commitdiff
|
tree
2011-05-10
Junio C Ham
a
no
Merge branch 'fc/completion-zsh' into sg
/
completion
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
J
u
nio C Hamano
Revert "com
p
letion:
d
on'
t
declare
'
local
w
ords' to
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Jun
i
o C Hamano
Re
v
ert "H
o
nor $(pre
f
ix) s
e
t in config
.
mak* when defi
n
ing
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Juni
o
C
Hamano
conver
t
: ma
k
e
i
t ha
r
der to screw up addin
g
a
conversion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
convert:
make it safer to add conversion attr
i
butes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hama
n
o
convert
:
give saner names
t
o cr
l
f/eol variables, types
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C
Hamano
convert: rename
the "eol" global
v
ariable to
"
co
r
e_e
o
l"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
t1
5
0
7
: avoid "${parameter<op>'word
'
}" i
n
sid
e
double
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio C
Hamano
t3701: add-p-
f
ix
m
ake
s
the
l
a
st t
e
st to
pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
J
u
nio C H
a
m
ano
rer
e
re:
libify rerere_clear() and rerere_gc(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
i
o C H
a
ma
n
o
merge:
i
ntroduce merg
e
.
ff
c
o
n
figuratio
n
variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio
C Ha
m
ano
Merge
branch 'jc/maint
-
branc
h
-mergeoptions' int
o
mg
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
Junio C Ha
m
a
no
merge: make branch
.
<na
m
e
>
.
mergeo
p
tion
s
cor
r
ectly override
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hama
n
o
Update draft rel
e
ase notes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merg
e
branch 'jn/run-command-error
-
failure
'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C Hamano
M
erg
e
br
a
nch 'js/
i
nfo-
m
an-p
a
t
h
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge b
r
anc
h
'i
m
/hashc
m
p-optim'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merg
e
bra
n
c
h 'jk/merge-on
e
-file-
w
orki
n
g-tree'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C Hama
n
o
Merge branch 'jc/fix-diff-f
i
les-unmerged'
commit
|
commitdiff
|
tree
2011-05-06
J
unio C
H
amano
Merge br
a
n
ch 'cj/p4
m
e
r
ge
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
H
a
m
ano
M
erge branch 'gr/cvsimport-alt
e
rna
t
ive-cvspa
s
s-location'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
H
a
ma
n
o
M
er
g
e br
a
n
ch
'
sg/
c
ompletion-cleanup'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C Hamano
Me
r
ge bra
n
ch 'js/blame-pa
r
sename
'
commit
|
commitdiff
|
tree
next