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 'as/t4012-style-updates'
2012-07-22
Junio C Hamano
Merge branch 'as/t40
1
2-style-updates'
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o C Hamano
Merge
b
ranch 'pg/maint-1
.
7
.
9
-am-where-is-patch
'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merg
e
branch 'jl/maint-1
.
7
.
10-recurse
-
submodules-wit
h
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merg
e
branch 'ms/dae
m
on-doc-ty
p
o'
commit
|
commitdiff
|
tree
2012-07-22
J
u
nio C Hamano
Merge branch 'lk/more-help
f
ul-sta
t
u
s
-hint
s
'
commit
|
commitdiff
|
tree
2012-07-22
J
u
n
i
o
C
Hamano
M
e
rge branch 'jc/sha1-
n
ame-mo
r
e'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hama
n
o
Merge b
r
anch 'jc/maint-fi
l
ter-branch-epoch-date'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C
Hamano
Upd
a
t
e draft release notes for 7th bat
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hama
n
o
Merge
b
r
anch 'tg/m
a
int-cache
-
n
ame-co
m
pa
r
e'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Hama
n
o
Merge branch 'jk/index-
p
ack-streaming-fix'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ha
m
a
no
Merge b
r
a
nch 'jk/maint-comm
i
t
-
a
mend-only-no-pa
t
hs'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
i
o C Hamano
Merge branch 'cw/amend
-
commit-without-messa
g
e'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch
'
jn/
m
akefile-cleanup'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
H
amano
Merge br
a
n
c
h 'ar/clone-honor-
u
mask-
a
t-top'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
M
e
rg
e
branch
'
jc/
a
pply-3way'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branc
h
'cw/rebase-i-root'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o C
Hamano
Merge branch 'pw/git-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Junio
C H
a
mano
Merge
b
ranch
'
pw
/
git-p4
-
jobs
'
commit
|
commitdiff
|
tree
2012-07-14
Jun
i
o
C
H
a
mano
Merge b
r
anc
h
'j
k
/push-delete-re
f
-error-message'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio
C Ha
m
ano
S
ixth batch fo
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ham
a
no
Mer
g
e bran
c
h 'j
c
/re
f
ac
t
or-d
i
ff-s
t
din'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Hamano
M
e
rge br
a
nc
h
'
t
g
/ce
-
namelen'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
i
o
C Ham
a
no
Merge b
r
a
n
c
h
'tb/sanitize
-
dec
o
mp
o
s
ed
-
utf-8-pathname'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge
branch 'mm/
m
edia
w
iki-
t
ests'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C H
a
mano
Merge branch 'jn/vcs-
s
vn'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branch 'm
m
/mediawiki-file-attachments'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Hamano
Merge bran
c
h
'
tr/main
t
-show-walk'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge
b
ranch
'
mz/
r
e
base-no-mbox'
commit
|
commitdiff
|
tree
2012-07-13
J
u
n
io C Hamano
t1512: mat
c
h
t
h
e
"other" obje
c
t
na
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Jun
i
o C Ha
m
ano
t7003: add test to f
i
lter a
b
ranch with a commit at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio C
H
ama
n
o
date
.
c: Fi
x
o
ff by one error in object-he
a
der d
a
te
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
t
1
512: ignore whi
t
espaces in wc -
l
o
utput
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
Reduce dra
f
t rele
a
se notes to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
S
y
n
c
with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C H
a
mano
Git 1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hama
n
o
Me
r
ge b
r
anch 'jc
/
maint-blame-unique-abbrev'
i
n
t
o mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C H
a
m
ano
Merge bra
n
ch 'rj/platform
-
p
r
ead-may-be-thr
e
ad-unsaf
e
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
i
o
C
Hamano
Merge branch 't
h
/diff-no-index-fixe
s
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C
Hamano
Mer
g
e branch 'nd/c
l
one-
s
ingle-fix' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
a
n
o
Merg
e
b
ranc
h
'jc/
r
ev-list-simpli
f
y-merges-
f
irst-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Merge branch
'hv/subm
o
dul
e
-u
p
date-nuke-submodule
s
'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge
b
ranch
'
jk/diff-no-index-pager' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Haman
o
Merge branch 'mm/v
e
rify-filen
a
me
-
fix' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hama
n
o
Me
r
ge branch 'cn/cherr
y
-p
i
ck-range-docs'
in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
a
no
Merge b
r
anch 'jc/ustar-checksum
-
is-
u
nsigned' int
o
mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
Merge
branch 'jc/bu
n
dle-complet
e
-no
t
ice' in
t
o main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Merge b
r
anc
h
'jc/ls-
f
iles
-
i-d
i
r' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C
Hamano
Merg
e
bran
c
h 'j
c
/
r
equest-pull-match-
t
agname'
into m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hama
n
o
ca
c
he_name_co
m
pare():
d
o not
t
r
u
ncate while comparing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
apply: tests for the
-
-3way optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Juni
o
C
Hamano
filter-
b
ranch
:
d
o
not for
g
et the '
@
' prefix to
f
orc
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rev-parse --disambiguate
=
<prefix>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
rev-parse: A and B in "rev-parse A
.
.
B" refe
r
to commit
t
i
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
r
eset: the comman
d
takes
c
o
m
m
ittish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
Hamano
commit-tree:
t
he command wan
t
s a
tre
e
an
d
commits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply: --bui
l
d-fake
-
a
nce
s
tor
expects blobs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o C H
a
mano
sha1
_
name
.
c:
a
d
d supp
o
rt for di
s
a
m
b
iguating other t
y
pes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
re
v
i
s
i
on
.
c: the "log" family,
except for
"sho
w
", takes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
revision
.
c:
a
llow handle_
r
evision_arg()
to t
a
ke other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
sha1_
n
a
me
.
c: i
n
troduce get_
s
ha1_committish()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
Ham
a
no
sha1_name
.
c: teach lo
o
kup co
n
text
to get_s
h
a1_with_context()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
sha
1
_name
.
c: ma
n
y
s
h
ort
names can only b
e
committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
Ha
m
an
o
s
h
a
1_name
.
c:
g
et_sha
1
_
1() take
s
loo
k
up flag
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hama
n
o
s
h
a
1
_
name
.
c:
g
e
t
_
d
escribe_na
m
e() by definition
g
rok
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
Ham
a
n
o
rerere: make rr
-
ca
c
he fanou
t
directory honor
umask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply: doc
u
ment --3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
a
mano
apply:
all
o
w rerere() to wor
k
o
n
-
-3way results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: reg
i
ste
r
confli
c
ted stages to the in
d
ex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
apply: -
-
3way with
a
d
d/add
conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
a
pply
:
mo
v
e verify
_
ind
e
x_match()
higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: plug t
h
e three-
w
a
y
me
r
ge
l
ogic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
a
pply: fall back
o
n three
-
way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hama
n
o
apply: accept -3/--
3
wa
y
command line
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
p
l
y: move "
a
lready
e
xists"
l
o
gic to check_to
_
create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
apply: move chec
k
_to_cre
a
te_blob() closer to
its sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ham
a
no
apply: further split l
o
ad_
p
rei
m
age()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: refactor "pre
v
i
ous patch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply: split l
o
ad_p
r
ei
m
ag
e
() he
l
p
e
r
function o
u
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Haman
o
apply: fact
o
r
out
c
heckou
t
_
target() hel
p
e
r funct
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
ap
p
ly: refactor read
_
file_or_
g
itlink
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
a
p
ply:
clea
r
_i
m
age() clears things
a
b
i
t
m
ore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Haman
o
apply: a bit more commen
t
s
on
PATH_
T
O
_
BE_DE
L
ETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
apply: f
i
x an incomplete comment
i
n che
c
k_patc
h
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge git://g
i
t
hub
.
com/git-l10n/g
i
t
-
po
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Fifth b
a
t
ch for 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
Merge
bra
n
c
h
'
c
w/help-
o
ver-network'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
H
ama
n
o
M
e
rge branch
'
mz/empty-rebase-test'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Haman
o
Merge bra
n
c
h 'pw/git-p4-tes
t
s'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Ham
a
n
o
Merg
e
branch 'js/fast-export-paths-wi
t
h
-
spaces'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
erge branch 'c
w
/no-detaching-an-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merg
e
b
r
a
n
c
h
'
v
r/us
e
-ou
r
-
p
erl-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
Merge
b
r
anch 'm
m
/
creden
t
ial-plumb
i
ng'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hama
n
o
Merge
b
ranch 'j
c
/maint-bl
a
me-uni
q
ue-ab
b
rev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch
'
j
n
/perl
-
makemaker-leadin
g
-paths'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
H
am
a
n
o
Merge branch 'rj/
p
latform-pread-may
-
be
-
thread-un
s
afe'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Ham
a
no
Merge branch
'mm
/
c
o
nfig-x
d
g'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Fourt
h
batch
for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge bra
n
ch 'nd/clone-single
-
fix'
commit
|
commitdiff
|
tree
2012-07-05
Juni
o
C Hamano
Merge branch
'
t
h/diff-no-in
d
e
x-fixes'
commit
|
commitdiff
|
tree
2012-07-05
Juni
o
C Hamano
Merge branch 'hv/r
e
mote-end-hung-up'
commit
|
commitdiff
|
tree
next