repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-remote-mediawiki: properly deal with invalid remote revisions
2012-07-16
Juni
o
C Hamano
Update
d
raft re
l
e
ase notes for 7th bat
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C Ha
m
an
o
M
e
rge branch 'tg/m
a
int-c
a
che-name-compa
r
e
'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C Ha
m
ano
Merge branch 'jk/inde
x
-pack-streaming-fix'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
M
erge branch 'jk/maint
-
commit-am
e
nd-only-no-paths'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch
'cw/amend-commit-with
o
ut-message'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
i
o
C Hamano
M
e
rge
branc
h
'jn/makefile-cleanup'
commit
|
commitdiff
|
tree
2012-07-16
J
u
ni
o
C Ham
a
no
Merge bran
c
h 'ar/clone-h
o
nor-umask-at-top'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C Hama
n
o
Merge branch 'jc/apply-3way'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o
C
H
amano
Merge branc
h
'c
w
/reb
a
se-i-ro
o
t
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ha
m
a
no
Me
r
ge branch 'p
w
/git-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Ju
n
io C
H
amano
M
e
rge bran
c
h 'pw/git-p
4
-
jobs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hama
n
o
M
e
rge branch '
j
k
/
push-delete-ref-error-mess
a
ge'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio
C Hamano
Sixth batch
f
or 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
ano
Merge br
a
nch 'j
c
/refactor-diff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
mano
Merge b
r
anch 't
g
/ce-
n
amelen'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Hama
n
o
Merge bra
n
c
h 'tb/sanitize-decomposed
-
utf-8-pat
h
n
ame'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge
b
ranch 'mm/mediawiki-tests'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C Hamano
Mer
g
e
branch 'jn/vcs
-
svn'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Hamano
Merg
e
br
a
nch 'mm
/
mediawi
k
i-file-attach
m
ents'
commit
|
commitdiff
|
tree
2012-07-13
J
unio
C
Hamano
Merge branch 't
r
/maint
-
show-walk'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Mer
g
e bra
n
ch 'mz/r
e
base-no-mbox'
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Reduce d
r
a
ft release notes to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
Syn
c
with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
Git 1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
Merge
b
ranch
'jc/maint
-
bla
m
e-unique-abbrev' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Haman
o
Merge
branc
h
'rj
/
platf
o
rm-pread-may-
b
e-thr
e
ad-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
unio
C Ha
m
ano
M
erge branc
h
'th/di
f
f-no-index-fixes' into ma
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Ha
m
ano
Merge branch 'n
d
/cl
o
ne-single-fix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge br
a
n
c
h 'jc/rev-list-simp
l
if
y
-
m
erges-first-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
m
a
no
Merge branch 'hv/submo
d
ule
-
up
d
ate-nuke-submodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
H
ama
n
o
Merge branch 'jk/diff-no-index-pager' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C
Ha
m
ano
Merge
branch
'm
m
/verify-filename-fix' into m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
man
o
Me
r
ge bra
n
c
h 'cn/cherry-pick-ran
g
e
-
docs' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C H
a
mano
Merge
b
r
a
nch 'jc/
u
star-checksum-is-unsig
n
ed' int
o
mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
H
a
m
a
no
M
e
rge branch 'j
c
/b
u
n
dle-complete-notic
e
' into
maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Merge branc
h
'j
c
/ls-f
i
les-i-
d
ir' into ma
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
J
unio
C
H
amano
M
erge branch
'
jc/request-pull
-
match-tagname'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
cach
e
_name_compare(): do not trun
c
ate wh
i
le
c
om
p
aring
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Ju
n
io C H
a
mano
a
p
ply:
tests
f
or the --3way opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
Hama
n
o
r
e
re
r
e:
m
ake
rr-
c
ache fanout d
i
rectory honor umask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C Haman
o
apply: doc
u
ment --3way
opt
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
a
mano
apply:
allow re
r
ere() to work on --
3
way re
s
ults
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
ap
p
ly:
r
e
gister
confli
c
t
ed
s
tages to the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
app
l
y: --3
w
ay with add/
a
dd co
n
flict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
ap
p
ly
:
m
ov
e
verify_ind
e
x_match() high
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Haman
o
apply: plug
the three-way merge l
o
gic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hama
n
o
app
l
y
:
fall back on t
h
r
e
e
-
w
ay me
r
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
a
p
ply: accept -
3
/
-
-3way co
m
ma
n
d line
optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C Haman
o
apply:
m
ove "already ex
i
sts" logic to check_t
o
_create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: move
c
heck_to_create_blob() closer to
i
ts sol
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: further
s
plit load_preima
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ha
m
an
o
apply: refactor "previous patch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
a
ppl
y
: split l
o
a
d
_preimage() help
e
r function
o
u
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply: factor out checkout_target() h
e
lper function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
ap
p
ly: refactor
read_file_or_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply: clear_image() clears
things a bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io
C
Haman
o
apply: a bit
m
ore comm
e
nts on
P
ATH_TO_BE
_
DE
L
ETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
pp
l
y: fix an
i
ncomplete comm
e
nt in
c
heck_p
a
tch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
M
e
r
g
e git://github
.
c
om/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
Fifth batch f
o
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hama
n
o
Merge branch 'cw/he
l
p-ove
r
-network'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
M
e
rge
branch 'mz/empty-rebase-test'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge br
a
nc
h
'pw/git
-
p
4
-test
s
'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Hamano
Merge b
r
an
c
h 'js
/
f
a
st-export-paths-with-spaces'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
Merg
e
b
r
anch 'cw/no-detaching-an-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
Merg
e
branch
'
vr/use-
o
ur
-
p
e
r
l
-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
Me
r
ge bra
n
ch 'mm/credential-plum
b
ing
'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ham
a
n
o
Me
r
ge
branch
'
jc/mai
n
t-bla
m
e
-
u
nique-a
b
b
r
ev'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ham
a
no
Me
r
ge bran
c
h
'
jn/per
l
-ma
k
ema
k
er-leading
-
paths'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o C Hamano
M
e
rge
branch 'rj/platform-prea
d
-may-be-thread-unsa
f
e'
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C
Hamano
Merge
branch 'mm/confi
g
-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Four
t
h batch fo
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
J
u
nio C Hamano
Mer
g
e
b
ranc
h
'
n
d/clone-singl
e
-fix'
commit
|
commitdiff
|
tree
2012-07-05
J
u
nio C Hama
n
o
Mer
g
e bra
n
c
h 'th/diff-no-index-fixes'
commit
|
commitdiff
|
tree
2012-07-05
J
un
i
o C Hamano
Merge branch 'hv/remo
t
e-end-hung
-
u
p'
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
Sync
w
i
th i1
8
n-po u
p
dates in maint
# Via
Junio C Hamano
(1) and Peter Krefting (1)
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
Merge branch 'maint' of git
:
//g
i
thub
.
com/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Junio C
Hamano
blame: com
p
ute abbr
e
viat
i
on width tha
t
ensures uniqueness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Hamano
d
iff-
i
ndex
.
c: "
g
it
d
iff" has
n
o need
t
o re
a
d blob from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
J
un
i
o C
Hamano
diff-in
d
ex
.
c
: unify handling of c
o
mmand line paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
diff-index
.
c: do
n
ot pre
t
e
nd paths are path
s
pecs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Haman
o
Third batch
f
or 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Haman
o
Me
r
ge b
r
an
c
h 'fc/git-prompt-script'
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
mano
Merge branch 'js/sub
m
odu
l
e-relat
i
v
e'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch 'l
k
/
m
ore-helpful-status-hints'
commit
|
commitdiff
|
tree
2012-06-28
J
unio C Hamano
Merge
b
ranch 'lk/rebase-i-x'
commit
|
commitdiff
|
tree
2012-06-28
J
unio C Ha
m
ano
Merge branch 'jc/rev-list-simplify-merges-
f
i
rst-parent'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C Hamano
M
e
r
g
e
branch 'hv
/
s
u
bmodu
l
e-update-nuke-submod
u
les'
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
ma
n
o
Merge branch 'nd/exc
l
ude-workaroun
d
-
t
op-heavy'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Haman
o
M
e
r
g
e branch 'nd/stream-pack-objects
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge
b
r
a
nch '
n
d/s
t
rea
m
-index-p
a
ck'
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio
C Hamano
Me
r
ge bra
n
ch 'mm/verify-filename-fix'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch 'j
k
/diff-n
o
-index-pag
e
r'
commit
|
commitdiff
|
tree
2012-06-26
Juni
o
C
Hamano
in
d
ex-
p
ack: Disable threading on c
y
g
w
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Sec
o
nd batc
h
fo
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
J
u
n
i
o C Haman
o
Merge branch
'lp/no-cmd-http-fetch'
commit
|
commitdiff
|
tree
2012-06-25
Junio C H
a
m
a
no
Mer
g
e branch 'cn/cherry
-
p
ick-ra
n
ge-d
o
cs'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
M
e
rge
branch
'
lm/git-blame-el'
commit
|
commitdiff
|
tree
2012-06-25
Junio C
H
amano
Mer
g
e b
r
anch 'rs/ipv6-ssh-ur
l
'
commit
|
commitdiff
|
tree
2012-06-25
J
unio
C
Hamano
Merg
e
b
r
a
nch '
j
c/ustar
-
checksum-is-unsigned'
commit
|
commitdiff
|
tree
next