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 'jl/maint-1.7.10-recurse-submodules-with-symlink'
2012-07-22
Juni
o
C H
a
mano
M
erge
b
ranch 'jl/maint-1
.
7
.
10-recurs
e
-subm
o
du
l
es-with
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C
H
a
m
ano
Merge b
r
anch
'
ms/daemon
-
doc-typo'
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io
C
Ham
a
no
Mer
g
e branch 'lk/more-h
e
lpf
u
l-sta
t
us
-
h
i
nts'
commit
|
commitdiff
|
tree
2012-07-22
J
unio C Hama
n
o
Merge branch 'jc/s
h
a1-n
a
me-more'
commit
|
commitdiff
|
tree
2012-07-22
Junio C
H
ama
n
o
Merge b
r
anch 'jc/maint-filter-branch-ep
o
ch-date'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C Ha
m
ano
Upd
a
te dr
a
ft release notes fo
r
7th
batch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C Hamano
M
erge branch 'tg/m
a
int-ca
c
he-name-compare'
commit
|
commitdiff
|
tree
2012-07-16
Junio C H
a
ma
n
o
M
e
rge branch 'j
k
/inde
x
-
pack-str
e
aming-f
i
x'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
M
erge bra
n
c
h
'
j
k
/maint-commit-
a
m
end-only-no-
p
a
t
hs'
commit
|
commitdiff
|
tree
2012-07-16
J
unio
C Ha
m
ano
Merge branch 'cw/amend-
c
o
mmit-w
i
thou
t
-messa
g
e'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
M
e
rge branch 'jn/
m
akefile-cleanu
p
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merg
e
branch '
a
r
/clo
n
e-hono
r
-umask-at-t
o
p
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch 'jc/apply-
3
w
a
y'
commit
|
commitdiff
|
tree
2012-07-16
J
un
i
o C
H
amano
Me
r
g
e
branch 'cw/reba
s
e-i
-
r
oot'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Hamano
Merge branch
'
pw/git-p4-move
'
commit
|
commitdiff
|
tree
2012-07-14
J
u
n
i
o C Hamano
Merge branch 'p
w
/
git-p4
-
j
o
bs'
commit
|
commitdiff
|
tree
2012-07-14
J
u
nio C Hama
n
o
Merg
e
branch '
j
k
/
p
ush-del
e
te-r
e
f
-
error-message'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C
H
amano
S
i
xth batch
f
or 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C Hamano
M
e
rge branch 'jc/refactor-diff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
a
mano
Merge
b
ranc
h
'tg/c
e
-n
a
mel
e
n'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C Ha
m
ano
Mer
g
e
branch
'
tb
/
saniti
z
e-decomposed-
u
tf-8-path
n
ame'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Haman
o
Merge bra
n
ch 'mm/me
d
iawik
i
-test
s
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hama
n
o
Mer
g
e bran
c
h '
j
n/vcs-svn'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Hamano
M
erge branch 'mm/medi
a
wiki-file-attachments'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Ha
m
ano
Merge branch 'tr/mai
n
t-
s
how-walk'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Ha
m
ano
Merge branch 'mz/rebase-no-mbox'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C Ham
a
no
t151
2
:
m
a
t
ch the "other" object names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
J
u
nio C Hamano
t7003: add
t
est
to filter a branch
with a
c
om
m
i
t at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Haman
o
da
t
e
.
c
: F
i
x
off by one error i
n
ob
j
ect
-
he
a
der d
a
te
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
t1512: ignore wh
i
tespaces in wc
-l output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
Reduc
e
draft r
e
lease notes to
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C H
a
mano
S
y
nc with 1
.
7
.
1
1
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Git 1
.
7
.
1
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
un
i
o
C
Hamano
Merge br
a
n
ch 'jc/main
t
-blame-uniq
u
e-abb
r
e
v
' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
an
o
M
erge branch 'rj/p
l
atfo
r
m
-
p
r
ead-may-be-thread-
u
nsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C H
a
m
ano
Merge branch 'th/
d
iff-no-index-fixe
s
'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C H
a
m
ano
Merge branch 'nd/clone-single-fix'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
Mer
g
e branch 'jc/rev
-
list-simpli
f
y-
m
erges-first
-
parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
Merge branch '
h
v/subm
o
dule-update-nuke-
s
u
bm
o
d
u
les'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merg
e
branc
h
'
j
k
/
diff-no-i
n
d
e
x
-pag
e
r' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio
C
Hama
n
o
Merge branch 'mm/
v
erify-filename-fix' into m
a
int
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C
H
amano
Mer
g
e branch 'cn/cherry-pick-range-doc
s
'
into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io C Hamano
Merge
b
ranch 'j
c
/
ustar-checksum
-
is-u
n
signed' into maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Ham
a
n
o
Merge b
r
anch
'
jc/bundle
-
comp
l
ete-notice
'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
M
e
rge bran
c
h 'jc/ls-files-i-di
r
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C
H
ama
n
o
Merg
e
branc
h
'jc/r
e
quest-
p
ull-match-tagname'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
cache_name_compare
(
): do not trunca
t
e
while comparing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
appl
y
: tests for the
-
-3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Ham
a
n
o
filter
-
branch: do
n
ot
forget the '@' pref
i
x
to force
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Hamano
rev-
p
arse
-
-disam
b
iguate=<prefix>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
r
e
v-
p
a
rs
e
: A and B in "rev-parse A
.
.
B" refer
to committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
Ham
a
no
reset: the command take
s
co
m
mitti
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Haman
o
commit-tree: the
command wants a tree and co
m
mits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
a
man
o
apply: --build-fake-an
c
estor
e
xpects blobs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
s
h
a1_name
.
c: add
suppo
r
t f
o
r disambigua
t
ing o
t
her typ
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
r
e
vision
.
c: the "log" fami
l
y, except for "
s
how", takes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hama
n
o
revision
.
c: all
o
w
h
andle_rev
i
sion_arg() to take other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C H
a
mano
sha1_name
.
c
:
intro
d
uce get_sha1_committish()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
s
h
a1
_
na
m
e
.
c: teach
lookup
c
onte
x
t
to get_sha1_with_conte
x
t
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_
n
a
me
.
c: man
y
sh
o
rt nam
e
s c
a
n onl
y
be
committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C Hama
n
o
s
ha1_name
.
c: g
e
t
_
sha1_1() takes lookup
f
lags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
sha1_name
.
c
:
get_describe
_
n
a
me() by def
i
nition groks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
rerere
:
m
a
k
e rr
-
cache
fanout directory
h
o
n
or umask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: docu
m
ent --3way op
t
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C Hamano
apply
:
allow re
r
e
r
e()
t
o 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
m
ano
apply: r
e
g
ister con
f
licted
s
t
age
s
t
o
t
h
e index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply: --3way with add/add conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
apply: move verify_index
_
match() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
apply: plug the
t
hree-
w
ay
m
e
rge logic
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
a
mano
apply: fall back on
t
hree-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: ac
c
ept -3/--3way command
line option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
n
o
a
p
ply:
m
ove
"
al
r
ead
y
e
xists" logic to
c
he
c
k_to_create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
apply
:
m
o
ve check_to_
c
reate_blob() cl
o
ser to its sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: further spli
t
load
_
pr
e
i
m
age(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
ap
p
l
y
:
refactor "pre
v
io
u
s
p
atc
h
" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
Hamano
apply: sp
l
it load_preimage
(
) helper function out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply: factor o
u
t check
o
ut_target() helper function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
apply: 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
Haman
o
a
p
ply: clear_image() clears
t
hin
g
s a b
i
t more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply:
a bit more com
m
e
n
ts
o
n PATH_TO
_
BE_D
E
LETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: fix a
n
incomplete c
o
mmen
t
in check_patch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o C Hamano
M
e
r
ge git://
g
i
t
hub
.
c
o
m/
g
it
-
l10
n
/gi
t
-
po
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
F
if
t
h batch fo
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ha
m
ano
Merge branch 'cw/
h
elp-over-network'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
e
rge branch
'
mz/em
p
t
y
-rebase-test'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
M
e
rge
b
ranch 'pw/git-p4
-
te
s
ts'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
Mer
g
e bran
c
h
'js/fast-export-pa
t
hs-with-spac
e
s'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
a
ma
n
o
Merge branc
h
'cw/no-detaching-an-unborn'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
M
e
rge branch 'vr/use-our-perl-in-tests
'
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hamano
Me
r
ge branch
'
mm
/
credential-plum
b
ing'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Merge branch 'jc/ma
i
nt-
b
lam
e
-u
n
ique-a
b
brev'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
Merge
branch
'
jn/per
l
-makemaker-leading-paths'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
Me
r
ge b
r
anch 'rj/platf
o
rm-pr
e
ad-
m
ay-be-
t
h
r
ea
d
-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge bra
n
ch
'm
m
/
c
onfig
-
xdg'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Ha
m
ano
F
o
u
rt
h
ba
t
c
h for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge bran
c
h 'nd/clone-single-fix'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Ha
m
ano
Merge branch
'
th/
d
iff-no-in
d
e
x-fixe
s
'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Ha
m
a
n
o
Merge branch 'hv/remote-end-hung-
u
p'
commit
|
commitdiff
|
tree
2012-07-03
Junio C
H
aman
o
sha1_na
m
e
.
c: teach
g
et_short_sha1() a c
o
mmit
-
o
n
l
y opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C
H
aman
o
sha1_name
.
c: a
l
low get_s
h
o
rt_sh
a
1
() to take other flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next