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
Update draft release notes to 1.7.12
2012-07-22
Junio C Hamano
Update draft release n
o
tes to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
Hamano
Sync
with
1
.
7
.
11
.
3
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
G
i
t
1
.
7
.
11
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge branc
h
'jk/push-delete-ref-erro
r
-
m
essage' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C
H
a
m
ano
Merge bra
n
ch 'ar/cl
o
ne-honor-umask-at-top' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C Hamano
Merg
e
branch 'cw/amend-commit-without-mes
s
age
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge branch 'jk/maint-commit-ame
n
d-on
l
y-
n
o-path
s
'
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
Ham
a
no
Merge
branch '
t
g/maint-cache-na
m
e-compare' into m
a
int
commit
|
commitdiff
|
tree
2012-07-22
Junio C Ha
m
ano
Merge
branch
'tr/main
t
-show-walk' into
m
aint
commit
|
commitdiff
|
tree
2012-07-22
J
u
nio C
H
amano
Merge branch 'jc/refac
t
or-
d
iff-stdin' i
n
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2012-07-22
J
u
n
i
o C Haman
o
Merge branc
h
'm
z
/empty-rebase-
t
e
st' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-22
Junio C Ha
m
ano
Merge
branch
'
js/fast-
e
xp
o
rt-paths-with-spaces' into
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C Hamano
M
e
rge bra
n
ch 'cw/n
o
-detach
i
ng
-
an-unbo
r
n' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C H
a
mano
Merge branch 'vr/
u
se
-
our-perl-in-tests' into maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C H
a
m
ano
Merge git://bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2012-07-22
J
unio C Hamano
Merge bran
c
h 'jk/revi
s
ion-walk-st
o
p
-
a
t-max-co
u
nt'
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C Ham
a
no
Merge branch
'
mm/
c
onfig-xdg'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge
b
ranc
h
'as/t40
1
2-style-updat
e
s'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge b
r
anch 'pg
/
maint
-
1
.
7
.
9-
a
m-
w
here-is-patch'
commit
|
commitdiff
|
tree
2012-07-22
Junio
C H
a
mano
Me
r
ge bran
c
h 'j
l
/mai
n
t-1
.
7
.
10-recurse
-
submo
d
ules-wit
h
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge
branch 'ms/da
e
m
o
n
-
doc-typo'
commit
|
commitdiff
|
tree
2012-07-22
Junio
C Hamano
Merge branch '
l
k/m
o
re-helpful-status-hints'
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o
C Ha
m
a
no
Merge bra
n
ch 'jc/sha1-name-more
'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge branch
'jc/m
a
in
t
-filter-branch-epoch-date'
commit
|
commitdiff
|
tree
2012-07-16
Junio C H
a
mano
Update draft re
l
ease not
e
s f
o
r
7th bat
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch 'tg
/
maint-cache
-
name-compare'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
M
e
r
g
e bran
c
h 'jk/index-p
a
ck-st
r
eaming-fi
x
'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Hamano
Me
r
ge branch 'j
k
/maint-commit-amend-only-no-path
s
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge bran
c
h 'cw/amend
-
commit-without-message'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C H
a
mano
Mer
g
e bra
n
c
h
'jn/mak
e
file-
c
leanup'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ham
a
n
o
Mer
g
e
branch 'a
r
/
clone-honor-umask-at-top'
commit
|
commitdiff
|
tree
2012-07-16
Junio C H
a
m
ano
Merge branch 'jc/app
l
y-3way'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o
C
Hamano
Me
r
g
e
branch 'cw/rebase-i-root'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o C
H
a
m
a
no
M
erge branch 'pw/gi
t
-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hama
n
o
M
erge
b
r
anch 'pw/git-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
J
unio C Hamano
M
erge bra
n
ch '
j
k/push-de
l
ete-ref
-
error-message'
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
mano
Six
t
h batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ham
a
no
M
e
rge br
a
n
ch
'
j
c/
r
efact
o
r-
d
iff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
i
o C Haman
o
M
erge
b
r
a
n
ch 'tg/ce-namelen'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge b
r
an
c
h '
t
b/sanitize-decomposed-utf-8-pathname'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio
C
Ha
m
a
no
Merge branch 'mm/me
d
ia
w
iki
-
tests'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge b
r
a
n
ch 'jn/vcs-svn'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
amano
Me
r
g
e
branch 'mm/mediawiki-file-attachments'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Haman
o
Merge branch
'
tr/maint-show-walk'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branch 'mz/rebase-no-mbox'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C
Hamano
t1512:
m
atc
h
t
he "othe
r
" object
nam
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Ju
n
io C Ha
m
a
no
t7003
:
add test to filter a branch wit
h
a com
m
it
at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Ju
n
io C Hamano
dat
e
.
c: Fix o
f
f
b
y
one erro
r
in ob
j
ec
t
-
h
eader 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 whitespaces in wc
-l o
u
t
p
ut
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
H
a
ma
n
o
Reduc
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 Hamano
Sync wit
h
1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Git 1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
ama
n
o
Merge b
r
anch 'jc/
m
ai
n
t-
b
lame-u
n
iqu
e
-abb
r
ev' into
m
a
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
M
erge branch 'rj
/
platfo
r
m-pread-
m
ay-be-t
h
read-unsa
f
e
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
un
i
o C Hamano
Merg
e
branch 'th
/
d
i
ff-no-i
n
d
e
x-f
i
xes'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
a
n
o
Merge branch 'nd/clon
e
-single-f
i
x' into
maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C
H
amano
Merge br
a
nch 'jc
/
r
e
v-list-simplify-
m
erges-f
i
rst-pare
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge br
a
nch 'hv/submodule-update-nuke-submodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
Merg
e
branch 'jk
/
dif
f
-
n
o
-index-pager'
into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'mm/verify
-
filena
m
e-fix' into
maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C
H
amano
Merge b
r
anch 'cn/cherry-pic
k
-range-docs'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
Merge bra
n
ch
'jc/u
s
tar-check
s
um-is-unsi
g
ned' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Me
r
ge branch 'jc/bundle-comple
t
e-
n
otice' into m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
Merge branch 'j
c
/l
s
-files-
i
-dir' into maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge br
a
nch 'jc/request-pull-match-tagname' into ma
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hama
n
o
cache_nam
e
_co
m
par
e
(): do
n
ot
t
r
uncat
e
while
c
omparing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Ha
m
ano
apply: tests
f
or
th
e
--3wa
y
opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
filter-branch: do not forget
t
he '@' prefix
to force
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
rev
-
parse -
-
di
s
ambiguat
e
=<p
r
e
fix>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
rev-
p
ar
s
e
: A and B
i
n "rev-pa
r
se A
.
.
B" refer t
o
committis
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
r
e
set: the
c
o
m
man
d
t
ak
e
s committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
co
m
mit-tree: t
h
e command wants a tr
e
e
a
n
d commi
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply: --build
-
fa
k
e-a
n
cestor expects
b
lobs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c: add s
u
p
port for disambiguating
o
th
e
r types
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
revision
.
c: the
"log" fa
m
il
y
, except fo
r
"show", takes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
revision
.
c
: al
l
ow h
a
ndle_revi
s
ion_arg() to
t
a
ke
o
t
h
er
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
s
ha
1
_name
.
c: int
r
oduce
g
et_sha1_com
m
itt
i
s
h
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
H
amano
sha1_name
.
c
: t
e
ach loo
k
up
c
ontext to get_
s
ha
1
_with_context()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
sha1_name
.
c
:
m
a
ny short names can only be committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
sh
a
1_name
.
c: get_sha1_1() takes lookup flag
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
sha1_name
.
c: g
e
t_d
e
scr
i
be_name() by
d
efinitio
n
groks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
rer
e
r
e
: make rr-cache fanout
d
irectory honor u
m
ask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
man
o
app
l
y: document --3wa
y
o
p
tio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hama
n
o
apply
:
al
l
ow rerer
e
() to wor
k
on
-
-3way results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
: register conflicted stages to th
e
index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
ap
p
ly:
-
-3wa
y
w
it
h
add/add
c
onflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: move verify_in
d
e
x_m
a
tch
(
) high
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
ap
p
ly: plug the three-way
merge logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
amano
apply: fal
l
back on
t
h
ree-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
ap
p
ly: acc
e
pt -3/--3w
a
y comm
a
n
d
line o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
apply: move "alre
a
dy
e
xists"
l
o
gic to che
c
k_to_create(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
H
a
m
a
no
apply: mo
v
e check_to_creat
e
_blob() close
r
to its sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
Hamano
ap
p
ly:
f
urt
h
er split
load_prei
m
age
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: refactor "previous
p
atch" l
o
gic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C H
a
mano
app
l
y
: s
p
lit
l
oad_preim
a
ge() helpe
r
function out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply: factor
o
u
t ch
e
ck
o
ut_targe
t
() h
e
lper
f
u
nction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
a
p
ply:
refac
t
o
r
r
e
ad_fil
e
_
o
r_git
l
i
nk()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply: c
l
ea
r
_image
(
) clears thin
g
s a bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
a
mano
ap
p
l
y: a bit more comments on PATH_TO_BE_DE
L
E
TED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Ha
m
ano
apply: fix an inco
m
pl
e
te comment in check_pa
t
ch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next