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
H
a
mano
Merge branch 'jk/index-pack-s
t
r
e
a
ming-f
i
x'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ha
m
an
o
Merge branch '
j
k/maint-co
m
mit
-
a
m
en
d
-o
n
ly-no-paths'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Hamano
Merge
branch '
c
w/amend-commit-w
i
thout-message'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C Hamano
M
e
rge branch 'jn/makefile-
c
lea
n
up'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o C
H
amano
Merge
b
ranch 'ar/cl
o
n
e-
h
ono
r
-
u
mask-at-
t
op'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C H
a
ma
n
o
Merge branch 'jc/apply-3way'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ham
a
no
Merge branch 'cw/r
e
base-i-r
o
ot'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hama
n
o
M
erge branch
'pw
/
git-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Jun
i
o
C
H
a
m
ano
M
e
rge bran
c
h '
p
w/
g
i
t-p
4
-
jobs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Haman
o
Merge branch 'jk/push-delete-ref-error
-
message'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ham
a
no
Sixth batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
i
o
C
H
ama
n
o
Merg
e
b
ranch 'jc/
r
efacto
r
-dif
f
-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branch 'tg/
c
e
-n
a
me
l
e
n'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hama
n
o
Merge
b
ra
n
ch
'tb/san
i
tize-decomp
o
sed-utf-8-pathname'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Hama
n
o
Merge branch 'mm/m
e
diawiki-t
e
s
ts'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ham
a
no
Merge br
a
nch
'
j
n/vcs-
s
vn'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C Hamano
Merge branch '
m
m
/mediawiki-file-att
a
chments'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Hamano
Merge bran
c
h 'tr/maint-show
-
wa
l
k'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hama
n
o
M
erge branch 'mz/reba
s
e-no-mbox'
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Redu
c
e draft release notes to 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Haman
o
Sync with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
G
i
t
1
.
7
.
1
1
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
a
m
a
n
o
M
er
g
e
branch 'jc/maint-blame
-
u
n
ique-abbre
v
'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
ama
n
o
Merge branch 'rj/platfor
m
-pread-
m
ay-b
e
-t
h
read-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
Merge
branch 'th/d
i
ff-no-index-fixes' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
M
erge
branch 'nd/clone-
s
ingle-fix' into
maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hama
n
o
M
erge branch 'jc/rev-list-simplify-me
r
g
es-fi
r
st-p
a
rent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C
Ha
m
ano
Merge bra
n
ch 'hv/s
u
bmodul
e
-
up
d
ate-nu
k
e-submodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge br
a
nch
'jk/diff-no
-
index-pager' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Ham
a
no
Merge branch 'mm/verify-filename-f
i
x' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
Merge branch
'cn/cherry-pick-range-doc
s
' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Haman
o
Merge branch 'jc/
u
star
-
checksum-is-un
s
i
g
ned'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
i
o C Hamano
Me
r
g
e
branch
'
jc/bundl
e
-c
o
mplete-
n
otice'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Merge b
r
anch 'j
c
/ls-fi
l
es-
i
-dir' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
i
o
C Hamano
Merge bran
c
h 'jc/re
q
uest-pull
-
match-tagname' into m
a
int
commit
|
commitdiff
|
tree
2012-07-10
J
unio C Hamano
apply: test
s
for the
-
-3w
a
y option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
un
i
o
C Hama
n
o
rer
e
re: mak
e
rr-cache fanout directory
h
o
nor umask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply: docu
m
ent --3w
a
y
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
app
l
y: allow
rerere
(
) to work on --3way re
s
ults
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
a
pply: register
c
onflicte
d
stage
s
to th
e
index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: --3way with
a
dd
/
add conflic
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
a
pp
l
y: move verify_index_match() higher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Haman
o
apply: plug the three-way merge
l
ogic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply: fa
l
l
b
ack
on three-way merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ham
a
no
ap
p
l
y
: accept -3/--3w
a
y comma
n
d line option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
a
ppl
y
:
mov
e
"
already exists" logic
t
o check_t
o
_create()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
pl
y
:
move c
h
eck_t
o
_create_blob() closer to i
t
s
sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply: further spl
i
t
lo
a
d_preim
a
ge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply: refactor
"pr
e
viou
s
p
atch
"
l
o
gic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: split
l
oad_preimage() helpe
r
fu
n
ction out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
app
l
y: f
a
cto
r
o
u
t
checkout_tar
g
et()
helper function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: refactor read_f
i
le_or_git
l
i
nk()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
appl
y
: clear_image() clea
r
s
things a bit more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
Hamano
appl
y
:
a bit more comm
e
n
t
s on PAT
H
_TO_BE_DELET
E
D
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply: fix an incomplete co
m
ment in c
h
eck
_
p
a
t
ch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
M
e
rge
g
it://g
i
thub
.
co
m
/
g
it-
l
10n/git
-
po
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
Fifth b
a
tch for
1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
Hamano
Merge
branch 'cw/h
e
lp-o
v
er-net
w
o
rk'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
Merge bran
c
h 'mz/empty-rebas
e
-test'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
e
rge branch '
p
w
/gi
t
-p4-tests
'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Merg
e
branch 'js/fast-expor
t
-paths-wit
h
-
s
paces'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
Merge branch 'cw/no-detaching-an-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
er
g
e branch
'vr/use-our-p
e
rl-in-te
s
ts'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merg
e
branch 'mm/c
r
edent
i
al-
p
l
u
m
bing'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
M
e
rg
e
branch 'jc
/
m
aint-b
l
am
e
-
u
n
ique-ab
b
rev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
Merge branch 'jn/p
e
rl-makemaker
-
leading-paths'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
Hamano
Merge br
a
nch 'rj
/
p
l
a
tfo
r
m
-
pread-ma
y
-
be
-
th
r
ead-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Haman
o
Merge
b
ranch 'mm/co
n
fig-xdg'
commit
|
commitdiff
|
tree
2012-07-05
J
unio C Hamano
Fourth
b
a
tch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Ju
n
io C Haman
o
Merge
branch 'nd/clone-si
n
gl
e
-fix'
commit
|
commitdiff
|
tree
2012-07-05
Junio
C
Hamano
Merge branch '
t
h/d
i
ff-
n
o-index-fixes'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge branch
'hv/
r
e
m
o
te-end-h
u
ng-up'
commit
|
commitdiff
|
tree
2012-07-02
Junio C H
a
ma
n
o
Sync wit
h
i18
n
-
po updates in maint
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
M
erge
b
r
anch '
m
a
i
n
t
' of git://github
.
com/
g
it-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
blame:
compute abbrev
i
ation
widt
h
th
a
t e
n
su
r
es unique
n
e
s
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
Hamano
diff-ind
e
x
.
c: "git diff"
has
n
o need to
read blob from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio
C Hamano
diff-i
n
dex
.
c: unify han
d
ling of
c
omma
n
d lin
e
pat
h
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
d
i
ff-index
.
c: do not pretend
p
aths are
p
at
h
spe
c
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Third
batc
h
f
o
r 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hama
n
o
Merge branc
h
'fc/git-promp
t
-script'
commit
|
commitdiff
|
tree
2012-06-28
J
u
ni
o
C Hamano
M
e
rge br
a
nch 'js/submo
d
u
l
e
-rel
a
tive'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branc
h
'l
k
/more-
h
elpful-statu
s
-
h
i
nts'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hama
n
o
Merge bran
c
h
'
lk/rebase-i-x'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hama
n
o
Me
r
g
e
branch 'jc/rev-list-simp
l
ify-m
e
rges-first-parent'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Haman
o
Merge branch
'hv/
s
u
b
m
o
dule-
u
pdate-nuke
-
submodules'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C
H
ama
n
o
Merge b
r
anch 'n
d
/
e
x
c
lude
-
workaroun
d
-top-heavy'
commit
|
commitdiff
|
tree
2012-06-28
J
unio C Hamano
Merge branch 'nd/stream-pack-objects'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
M
erge
b
ran
c
h 'n
d
/
s
tream-in
d
ex-p
a
c
k
'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C Hamano
Merg
e
branc
h
'
m
m
/
ve
r
ify-f
i
len
a
me-fix'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge
b
ranch
'
jk/diff-no
-
index-
p
ager'
commit
|
commitdiff
|
tree
2012-06-26
Juni
o
C Hamano
index-pack: Disable threading on cygwi
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Junio
C
Hamano
Second ba
t
ch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branch 'lp/no
-
cmd-http-fetch'
commit
|
commitdiff
|
tree
2012-06-25
Junio
C
Hamano
Me
r
ge branch 'cn/cherry-pick-
r
ange-docs'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge bra
n
ch 'lm/git-blame-el'
commit
|
commitdiff
|
tree
2012-06-25
Junio C
Hamano
Merge branch
'rs/i
p
v6-ssh
-
url'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Ham
a
no
Merg
e
bra
n
ch 'jc/ustar-
c
he
c
ksum-is-unsigne
d
'
commit
|
commitdiff
|
tree
2012-06-25
Junio
C
Hamano
Me
r
ge branch 'rs/git-blame-map
c
ar-mapc'
commit
|
commitdiff
|
tree
2012-06-25
J
u
ni
o
C
Hamano
Merge
b
r
anch
'
rr/do
c
-commit'
commit
|
commitdiff
|
tree
2012-06-25
J
u
nio C Hamano
Merge branch 'nd/i18n-misc'
commit
|
commitdiff
|
tree
next