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/index-pack-streaming-fix'
2012-07-16
Junio C Hamano
Me
r
ge bran
c
h 'j
k
/index-
p
a
c
k-st
r
ea
m
ing-fix'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C Hamano
Merge
bra
n
ch 'jk/maint-
c
ommit-amend-only-no-paths'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ham
a
no
Me
r
ge branc
h
'cw/amend-commit
-
without-message'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hama
n
o
Merge
branch 'jn/makefile-clea
n
up
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branc
h
'ar/clon
e
-ho
n
or-umask-at-to
p
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Haman
o
Merge
branch 'jc/apply
-
3way'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
H
amano
Merge branch 'c
w
/r
e
base-i-root'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Hamano
M
erge br
a
nch 'pw/git-p4-mo
v
e'
commit
|
commitdiff
|
tree
2012-07-14
Juni
o
C Hamano
Mer
g
e bra
n
ch 'pw/gi
t
-
p
4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
M
erge b
r
anch 'jk/push-delet
e
-ref-er
r
o
r-message'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C
Hamano
Sixth
b
atch for
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Ham
a
no
Merg
e
branch
'
jc/refactor-diff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Haman
o
Merge branch 'tg/ce
-
na
m
elen'
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
mano
M
e
r
ge bran
c
h
'tb/sa
n
itize-decomposed-utf-8-pathname'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C Hamano
Mer
g
e branch
'
mm/
m
ediawiki-tests'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
H
a
mano
Merge branch
'jn/vcs-svn
'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io
C H
a
mano
Me
r
ge
branch 'mm/
m
e
diawiki
-
file-attachm
e
nts'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Hamano
Me
r
g
e
bra
n
c
h
'tr
/
m
a
int-show-
w
a
lk
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
M
e
rge b
r
anch
'
mz/rebase-no-mbox'
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hama
n
o
R
e
d
u
ce draft release notes to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Sync with 1
.
7
.
1
1
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
a
m
ano
Git 1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
Merge
b
ranch 'jc/maint-bl
a
me-u
n
ique-abbrev' into
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
m
ano
Merge bra
n
ch
'
rj/platfo
r
m-p
r
ead-m
a
y-be-thread-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
i
o C Ha
m
an
o
M
e
rge
b
ranc
h
'th
/
di
f
f-no-index-fixes'
i
nt
o
ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Ha
m
a
n
o
Merge branc
h
'nd/
c
lone-single-
f
i
x
'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io C Ha
m
ano
Merge branch 'jc/rev-list-simplify-merges-first-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C Hamano
Merge branc
h
'hv/submodule-update-nu
k
e-submodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C H
a
m
ano
Merge branch 'jk/diff-no-inde
x
-p
a
ger'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C
H
amano
Merg
e
branch 'mm/v
e
rify-filename-fix'
i
n
to
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
H
amano
Merge bran
c
h 'cn/c
h
err
y
-pick-range-docs
'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
i
o C Ha
m
ano
Me
r
ge bra
n
ch 'jc
/
usta
r
-checksum-is-unsigned'
into main
t
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
Merge b
r
anch
'jc/bundl
e
-
c
omplet
e
-notice' into
m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge b
r
anc
h
'
j
c
/
ls
-
files-i-
d
ir
'
int
o
ma
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jc
/
r
equest-p
u
ll-matc
h
-tagname'
i
n
t
o maint
commit
|
commitdiff
|
tree
2012-07-10
J
u
nio
C
Hamano
a
pp
l
y: te
s
ts for the --3wa
y
opt
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hama
n
o
rerer
e
: make rr-c
a
che fanout d
i
rec
t
o
ry
h
onor u
m
a
s
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ha
m
an
o
apply: do
c
ument --3way optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ha
m
ano
a
p
p
l
y: allo
w
r
e
rere() to work on -
-
3w
a
y results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: regis
t
er c
o
nf
l
ic
t
ed stage
s
t
o
the i
n
dex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
Hamano
apply: -
-
3
wa
y
w
i
th
add/add conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: move veri
f
y
_
index_
m
atch(
)
higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o
C Hamano
ap
p
l
y: plug the three-w
a
y merg
e
logic
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
apply
:
f
al
l
back on three-way me
r
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
amano
a
pply: accept -3/
-
-3way
command line
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
app
l
y: mo
v
e "
a
lready exists"
l
ogi
c
to
ch
e
c
k
_to_create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
a
pply: move chec
k
_to_
c
r
ea
t
e_blob() clo
s
e
r
to its
sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply
:
further
s
plit load_preimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply:
refactor
"
p
r
evious patch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C H
a
ma
n
o
apply: s
p
lit load_preimage(
)
h
e
lper
f
u
nction out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ha
m
ano
apply
:
factor out checkout_t
a
rget() helper
f
unctio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
a
pply: refactor re
a
d_file_or_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
H
aman
o
apply: clear_image() clea
r
s thing
s
a bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
a
b
i
t
more comments
o
n P
A
TH_
T
O_BE_DE
L
ETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: fix an inc
o
mplete comment in check_patch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
Merge git:
/
/github
.
com/git-
l
10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
Fifth batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
M
e
rg
e
branch 'cw/help
-
o
ver-network'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Merge branch '
m
z/empty-rebase-te
s
t'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
Merge b
r
anch 'pw/git-p4-tes
t
s
'
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io
C Hamano
Merge branch 'js/fast
-
export-pa
t
hs
-
with-
s
p
a
ces'
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C
H
amano
M
e
r
g
e
b
ranch 'cw/no-deta
c
hing-an
-
unborn'
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hamano
Merge b
r
an
c
h
'
vr/use-our-pe
r
l-in-tes
t
s'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C H
a
mano
Merg
e
branch '
m
m/creden
t
ial-plumb
i
n
g
'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Mer
g
e
branch 'jc
/
m
a
int-blame-unique-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
mano
Merge
branch 'j
n
/perl-m
a
kemaker-leading-paths
'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
M
e
rg
e
branch 'rj/platform-pread-may-be-thr
e
ad-
u
nsa
f
e
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
Mer
g
e branch 'mm/c
o
nfig-xdg'
commit
|
commitdiff
|
tree
2012-07-05
J
unio C H
a
mano
Fourth
ba
t
ch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge branch 'nd/clone-single-f
i
x'
commit
|
commitdiff
|
tree
2012-07-05
Juni
o
C Hamano
Merge
b
r
anch
'
t
h/dif
f
-no-index-fix
e
s
'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge branch '
h
v/remot
e
-end-hung-up'
commit
|
commitdiff
|
tree
2012-07-02
J
u
nio C Haman
o
Sync with i18n
-
p
o
updat
e
s in maint
# Via
Junio C Hamano
(1) and Peter Krefting (1)
commit
|
commitdiff
|
tree
2012-07-02
Junio C H
a
man
o
Mer
g
e branch 'maint' of git://gi
t
h
u
b
.
com/git
-
l10
n
/
gi
t
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
J
uni
o
C
Hamano
blame: compute abbrevi
a
tion
w
i
dth
that
e
nsures uniquene
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ha
m
ano
diff
-
i
ndex
.
c: "git diff" has no need to read blo
b
from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
m
ano
d
i
ff-index
.
c: unify handling of co
m
mand line paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ha
m
ano
diff
-
index
.
c: do not pre
t
end
paths are pathspecs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Third ba
t
ch for
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio
C Hamano
Merge bran
c
h
'
fc/git-
p
rompt-script'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch 'js/submod
u
le-r
e
lative'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
amano
Merge branc
h
'
l
k/
m
o
r
e-helpful
-
s
t
atus-hints'
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
man
o
Mer
g
e
branch 'l
k
/rebase-
i
-x'
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io C Hamano
Me
r
ge bran
c
h 'jc/re
v
-list-simplify-merges-first-parent'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C Hamano
Merge bran
c
h
'hv/submodule-upda
t
e-nuke-submodules'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Haman
o
Merge
branch '
n
d/exclude-workarou
n
d-top-he
a
v
y'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Haman
o
Merge b
r
anch
'
n
d
/stre
a
m-pac
k
-objects'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
Hama
n
o
Merge b
r
anch
'
n
d
/s
t
ream-
i
n
dex-pack'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
H
amano
Merge branch
'mm/verify
-
f
ilename-fix'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branc
h
'jk/diff-no-index-
p
ag
e
r'
commit
|
commitdiff
|
tree
2012-06-26
Junio C Hamano
ind
e
x-pa
c
k: Disable
t
h
r
eading
on cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
J
unio C H
a
mano
Se
c
ond bat
c
h for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hama
n
o
Merge branch
'
l
p/no-cmd-http-fetc
h
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
M
e
r
ge bra
n
ch '
c
n/cherry-pick-r
a
nge-docs'
commit
|
commitdiff
|
tree
2012-06-25
J
unio C Hamano
M
e
rge branch
'
lm/git-blame-el'
commit
|
commitdiff
|
tree
2012-06-25
J
unio C Hamano
M
e
r
ge bra
n
ch 'r
s
/
ipv6-ssh
-
url'
commit
|
commitdiff
|
tree
2012-06-25
J
unio C Hamano
Merge bran
c
h 'j
c
/ustar-checksum-is-unsigned'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branch
'rs/git-blame-mapcar-map
c
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Haman
o
Merge branch 'rr
/
do
c
-commit
'
commit
|
commitdiff
|
tree
2012-06-25
J
u
n
io C Hamano
Merge b
r
a
n
ch 'nd/i18n-misc'
commit
|
commitdiff
|
tree
next