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
Git 1.7.12-rc3
2012-07-16
J
u
nio C H
a
m
ano
M
er
g
e br
a
nch 'jk/
i
n
d
ex-pack-streaming-fix'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch '
j
k/maint-commi
t
-
am
e
nd
-
o
n
l
y-no
-
pat
h
s'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C
H
amano
Me
r
ge branch 'cw/ame
n
d-commit-witho
u
t-messag
e
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C H
a
man
o
Merge
b
ranch 'jn/makefile
-
cleanup'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o C Hamano
Merge bran
c
h '
a
r/clone-honor-umask-at-top'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
H
amano
Merge branc
h
'
j
c/apply-
3
wa
y
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
Hamano
Merge branch 'cw/
r
ebase-
i
-root'
commit
|
commitdiff
|
tree
2012-07-16
J
uni
o
C Hamano
Merge branch 'pw/g
i
t-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Junio
C Haman
o
M
e
rge b
r
anch 'pw/git-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
J
uni
o
C
H
a
m
ano
Merge
branch '
j
k/pus
h
-delete-
r
ef-erro
r
-me
s
sage'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
ano
Sixth
batch for 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C
H
amano
M
e
rge b
r
anch '
j
c/refactor-diff-stdi
n
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Haman
o
Merge branch '
t
g/
c
e-namelen'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Ham
a
no
M
e
rg
e
bra
n
ch 'tb/sanitize
-
d
eco
m
posed-utf-8-path
n
a
m
e'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branch 'mm/medi
a
wiki-tests'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branch '
j
n
/
vcs-svn'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
an
o
Merge branch 'mm/mediawik
i
-fi
l
e-attachments'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Hamano
Merge branch 'tr
/
maint-show-walk'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hama
n
o
Mer
g
e branch 'mz
/
rebas
e
-no-
m
b
o
x'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
t15
1
2: match the "other"
ob
j
ect names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Ha
m
ano
t7003: add test to filt
e
r a bra
n
ch with a commit at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Jun
i
o
C
H
am
a
no
date
.
c: Fix
o
ff by one error in
o
bj
e
ct
-
h
eader date
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
t1512: ignore
w
hitespaces in
w
c -l
o
utput
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
H
amano
Red
u
c
e draft
release
notes to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
Sync with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C
H
amano
Git 1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
M
e
rge
branc
h
'jc/
m
ai
n
t
-
blame-unique-abbrev' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Merge b
r
a
n
ch 'rj/platf
o
r
m
-pread-may-be-thread-u
n
sa
f
e
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
Haman
o
Mer
g
e branch 'th/diff-no-
i
n
dex-fix
e
s' into m
a
int
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Merge branc
h
'
n
d/clone-
s
ingle-fix' into m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Merge bra
n
ch 'jc/rev-list-simplify-merges-
f
irst-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge b
r
a
n
ch 'hv/
s
ubmodul
e
-update
-
nuke-submodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Ha
m
ano
Merge branch 'jk/diff-
n
o-in
d
ex-pager' in
t
o
main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Ha
m
ano
Merge br
a
nch 'mm/ve
r
ify-filena
m
e
-fix' into
ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Ham
a
no
Mer
g
e
branch 'cn/cherry-
p
ic
k
-r
a
n
ge-docs' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
e
r
ge bran
c
h 'jc/ustar
-
checksu
m
-is-unsign
e
d' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
Merge branch 'jc/bundl
e
-
complete-notice' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C H
a
mano
Mer
g
e b
r
anch 'jc/ls-files-i-dir' into maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge bra
n
ch 'jc/request-pu
l
l-ma
t
ch-tagname'
i
n
t
o ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merg
e
branc
h
'tg/main
t
-cache-name-
c
o
m
pare' into
t
g
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
cache_na
m
e_
c
ompare(
)
:
do not trunc
a
te while comparing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C H
a
mano
apply: tests f
o
r the --3way optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Ju
n
i
o
C
Hamano
f
ilter-br
a
nch: do not
forget
t
h
e '@' prefix to force
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ham
a
n
o
rev-parse --disambiguate=<prefi
x
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rev
-
p
a
r
se: A and
B i
n
"re
v
-p
a
r
s
e A
.
.
B" refer to committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
reset: th
e
com
m
and takes committi
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
commit-
t
r
ee: th
e
c
o
mmand wants
a tree an
d
c
o
m
mi
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hama
n
o
appl
y
:
--build-fake-ancestor expects blobs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hama
n
o
sha1_name
.
c
: add support fo
r
disambiguating othe
r
types
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
Hamano
revi
s
ion
.
c: the
"log" fami
l
y, e
x
c
e
pt
f
or "show", t
a
kes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
revision
.
c
:
all
o
w ha
n
dle_revis
i
on_arg() to take
other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
sha1_name
.
c:
in
t
roduce get_sha1_committish()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
H
amano
sha1_name
.
c: teach l
o
o
k
u
p
con
t
ext to get_sha1_w
i
th_con
t
e
x
t()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
sha1_name
.
c
: man
y
shor
t
n
ames
c
a
n only be committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
sha1_name
.
c: get_sha
1
_1() takes lookup flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Haman
o
sha1_
n
ame
.
c: get_d
e
scribe_
n
ame() by
definition groks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
rerere:
ma
k
e rr-cac
h
e
f
a
nout dir
e
ctory h
o
nor um
a
sk
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
apply: doc
u
me
n
t --3way opt
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: allow
r
erere()
to work
o
n --3way re
s
ults
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
apply: register conflicted stag
e
s to the in
d
ex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ha
m
a
no
apply: --3way with
add/add c
o
nf
l
ict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
Ham
a
no
a
pp
l
y: move ve
r
ify_index_
m
a
t
ch() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
apply: plug
t
he three-way merge
l
o
g
ic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
f
all back o
n
t
hr
e
e-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
H
a
m
ano
apply: acce
p
t
-3/--
3
w
a
y command line option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply:
mo
v
e
"
already e
x
ists" logi
c
t
o check_to_creat
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: mo
v
e
chec
k
_to_cre
a
t
e_
b
l
ob() clos
e
r to its sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Hamano
apply:
f
urther s
p
l
it lo
a
d
_
preimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply: refacto
r
"previous
p
atch
"
logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
a
no
apply: spli
t
load_
p
reimage() help
e
r function out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ham
a
n
o
apply
:
factor out chec
k
out
_
ta
r
get() helper function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
apply: refa
c
tor
r
e
a
d_f
i
le_or_gitlin
k
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hamano
apply: clear_
i
mag
e
(
) clears things a bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
a
no
ap
p
ly: a bit
more c
o
m
m
ents on PA
T
H_TO_BE_
D
ELETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
f
i
x
an inc
o
mplete
c
omment
i
n
c
heck_pat
c
h()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge git://github
.
c
o
m/git-l1
0
n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
F
ifth bat
c
h
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
b
ranc
h
'cw/help-over-network'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
Merg
e
br
a
n
c
h 'mz/empty-rebase-
t
est'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merg
e
branch 'p
w
/
gi
t
-
p
4-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
Merge bran
c
h 'js/fast-export-paths-with
-
spaces'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Merge
branch 'c
w
/
no
-
de
t
aching
-
an-un
b
o
rn'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
Hamano
M
e
rge bran
c
h 'vr/use-our-p
e
r
l
-
i
n-tests'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
Merge branch
'
mm/
c
redential-pl
u
mbing'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
Merge bra
n
ch 'jc/maint-bla
m
e-unique-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
M
e
rge br
a
nch
'
j
n/perl-makemaker-leading-path
s
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merg
e
branch
'rj
/
platform-pread-
m
ay
-
be-th
r
e
ad-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Merg
e
branc
h
'm
m
/config-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Fourth bat
c
h
f
or 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Junio C
H
ama
n
o
Merge bra
n
ch 'nd
/
cl
o
ne-sing
l
e-fix'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Ham
a
no
M
e
r
ge branch 'th/diff-n
o
-
index-fixe
s
'
commit
|
commitdiff
|
tree
2012-07-05
J
unio C
Hamano
Mer
g
e bra
n
ch '
h
v/remote-end-hung-u
p
'
commit
|
commitdiff
|
tree
2012-07-03
Junio C H
a
mano
sha1_n
a
m
e
.
c: teach
get_short_sh
a
1() a comm
i
t-
o
nly option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_name
.
c:
allow get
_
short_sha1() to take other flag
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C H
a
ma
n
o
get_sha1()
:
fix e
r
ro
r
status regression
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Juni
o
C Hamano
sha1_n
a
me
.
c: r
e
structu
r
e disambigua
t
ion
o
f
s
hort names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C
Hama
n
o
sha1_name
.
c
:
correc
t
misnamed
"
canoni
c
a
l
" a
n
d "re
s
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
J
u
nio C Hama
n
o
s
ha1_name
.
c: refactor find_short
_
p
a
cked_objec
t
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
J
unio C Haman
o
sha1_name
.
c: rename "now"
to "cur
r
en
t
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Juni
o
C
H
amano
s
ha1_name
.
c
: clarify wha
t
"
fake
"
i
s
for in find_short_obj
e
ct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next