repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'tg/ce-namelen-field'
2012-07-24
Jun
i
o C H
a
mano
Me
r
ge branch 'tg/ce-namelen-field'
commit
|
commitdiff
|
tree
2012-07-24
Junio C Ham
a
no
Mer
g
e branch 'n
k
/maint
-
gitweb-
l
o
g
-
by-li
n
es'
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o C Hama
n
o
Upd
a
te draft r
e
lease notes to 1
.
7
.
1
2
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
J
u
nio C Hamano
Merge b
r
an
c
h
'jk/push-delete-ref-
e
rro
r
-mes
s
age' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
Hamano
Merge b
r
a
n
ch 'ar/clone
-
honor-umask-at-top' into maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge
br
a
nch 'cw/a
m
en
d
-commit-without-message'
into
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
J
unio C Hama
n
o
Me
r
ge branch 'jk/ma
i
nt-commit-amend-only
-
no-paths'
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge br
a
nch 'tg
/
maint-cach
e
-name-
c
ompare'
i
nto m
a
int
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C Hamano
M
erge b
r
anch 'tr/ma
i
n
t
-show-walk' into maint
commit
|
commitdiff
|
tree
2012-07-22
Junio
C Hamano
Me
r
ge b
r
anch '
j
c/refactor-diff-
s
tdin' into
maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hama
n
o
Merge branch '
m
z/empty-rebase-test
'
into maint
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C Hama
n
o
Merge branch 'js/
f
ast-ex
p
ort-p
a
ths-
w
ith-spaces' into
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
J
uni
o
C Hamano
M
e
rge branch 'cw/no-det
a
c
h
ing-an-unbo
r
n' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io C Hamano
Merge branch
'
vr/
u
se
-
o
ur-perl-in-tests'
i
n
to main
t
commit
|
commitdiff
|
tree
2012-07-22
Junio C Ha
m
ano
Merge
gi
t
://bogomips
.
org/
g
i
t
-
s
v
n
commit
|
commitdiff
|
tree
2012-07-22
Junio
C Hamano
Merge branch '
j
k/revisi
o
n-w
a
lk-stop-at
-
max-count
'
commit
|
commitdiff
|
tree
2012-07-22
J
u
nio C Ha
m
ano
Mer
g
e
b
ran
c
h 'mm/config-xdg'
commit
|
commitdiff
|
tree
2012-07-22
J
u
nio C Hamano
Me
r
ge branch 'as/t4012-style-up
d
ates'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Mer
g
e branch
'pg/maint
-
1
.
7
.
9-am-w
h
e
r
e
-is-patch'
commit
|
commitdiff
|
tree
2012-07-22
Junio C
Hama
n
o
Merge branch 'jl/maint
-
1
.
7
.
10-recurse-submo
d
ules-with
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C
Ham
a
no
Me
r
ge
b
ra
n
ch 'ms/daemon-doc-typ
o
'
commit
|
commitdiff
|
tree
2012-07-22
Junio
C Hamano
Merge
b
ra
n
ch 'lk/more-he
l
pful-st
a
t
us-hints'
commit
|
commitdiff
|
tree
2012-07-22
Junio C
Hamano
Merge branch 'jc/
s
ha1-name-more'
commit
|
commitdiff
|
tree
2012-07-22
J
unio C Ha
m
a
no
Mer
g
e branch 'jc/main
t
-
filter-
b
ranc
h
-epoc
h
-da
t
e'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C Hamano
Updat
e
draft release notes for 7th batch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Junio C
H
a
mano
Merge branch 'tg
/
ma
i
n
t-cache-nam
e
-compare'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C Hama
n
o
Merge branch 'j
k
/i
n
d
e
x
-pa
c
k-strea
m
ing
-
fix'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hama
n
o
Mer
g
e branch 'jk/
m
aint-commit-a
m
en
d
-onl
y
-no-
p
aths'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
M
e
rg
e
branch 'cw/amend-c
o
mmit-without-m
e
ssage'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branc
h
'jn/m
a
k
efile-clea
n
u
p'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hama
n
o
Merg
e
branch 'ar
/
clone-honor-umas
k
-at-top'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C Hamano
Merge branch 'jc/
a
p
ply-3way'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
H
aman
o
Merg
e
branch 'cw/re
b
ase-i-root'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C Hamano
Merge
b
ra
n
ch 'pw/git-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
J
u
nio
C Hamano
M
erge
b
ran
c
h 'pw/gi
t
-p4-jobs
'
commit
|
commitdiff
|
tree
2012-07-14
Juni
o
C Hamano
M
e
rge branch
'jk/push-delete-ref-err
o
r-mess
a
ge'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Ham
a
no
Six
t
h
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
Merge b
r
anc
h
'jc/
r
e
f
a
ctor-d
i
ff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hama
n
o
Merge branch 't
g
/ce-na
m
elen'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C
H
amano
Merg
e
branch 'tb/sanitiz
e
-deco
m
posed-utf
-
8-pa
t
hname'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Hama
n
o
Merge br
a
nch 'mm/me
d
i
awiki-tests'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C
Ham
a
no
Merge br
a
nch 'jn/vcs
-
svn'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio
C
Hama
n
o
Merge
bra
n
c
h
'mm/mediawiki-fil
e
-attach
m
ents'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
ano
Merge br
a
n
ch '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: ma
t
ch t
h
e "other" object n
a
mes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio
C
Hamano
t
7
0
03: add test to
filt
e
r a b
r
anch with a
c
ommit at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio C
H
amano
date
.
c:
F
ix off
b
y o
n
e
error in object-hea
d
er
date
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
t1512: ignore wh
i
t
espaces
i
n wc
-
l output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
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 with
1
.
7
.
11
.
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
Junio C Hamano
Merge branch 'jc/maint-blame-unique-abbrev' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge br
a
nch
'rj/p
l
atform-pread-ma
y
-
be-thread-un
s
a
f
e
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
M
e
rge branc
h
'th/diff-no-index-fix
e
s' i
n
to main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
Merge
bran
c
h 'nd/cl
o
ne-single-fix'
i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge
branc
h
'jc/rev-list-simplify-merges-first
-
pare
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
Merge branch
'hv/su
b
module-update-nuke-s
u
b
m
o
dules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
unio C
Hamano
M
e
rge bra
n
ch 'jk/d
i
ff-no-index-pager' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hama
n
o
Merge branch '
m
m/ver
i
fy-filename-fix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
M
erge
branch 'cn/cher
r
y-pick-range
-
docs' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
M
e
rge bra
n
ch 'jc
/
ustar-chec
k
sum-is
-
unsigned' into m
a
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
J
unio
C
Ha
m
a
no
M
e
rge branch 'jc/b
u
ndle-complete-notice' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
erge
b
r
anch 'jc/ls
-
files-i-dir' into maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
Merge branch 'jc/request-pull-m
a
tch-tagname' into main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
M
e
rge
b
ranch 'tg/m
a
i
n
t
-
cache-na
m
e-c
o
mpar
e
' into tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
cache_name_co
m
pare(): d
o
not
t
runcate while c
o
m
p
aring
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio
C
Hama
n
o
appl
y
: te
s
ts
for the --3wa
y
optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
filter-b
r
anch: do not
forg
e
t the '@' prefix to force
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ham
a
no
rev-parse -
-
d
i
sambigu
a
te=<prefix>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C Ha
m
ano
r
e
v-parse: A and B i
n
"
r
e
v-
p
arse A
.
.
B
" r
e
fer to
committi
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o C Hamano
r
e
set
:
the com
m
a
n
d
takes com
m
ittish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
commit-tree: the comm
a
nd wants a
t
ree
a
n
d
commits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ha
m
a
no
a
p
ply: --bui
l
d-fake-ancestor expe
c
ts
blobs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
sh
a
1
_na
m
e
.
c: ad
d
s
u
pport for
disambiguating other types
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Haman
o
revis
i
on
.
c
:
the "lo
g
" fa
m
i
l
y,
e
xcep
t
for
"
sho
w
"
, takes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
H
amano
revis
i
on
.
c: al
l
ow h
a
ndle_
r
evisio
n
_arg(
)
to take other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
sha
1
_name
.
c: introduce get_sha1_committ
i
sh()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
sha1_
n
ame
.
c
:
teac
h
lookup c
o
ntext to ge
t
_sha1_with_context()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Haman
o
sha1_n
a
m
e
.
c
:
many short
n
ames can 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_sh
a
1_1() takes lookup
f
lags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_na
m
e
.
c: get_describe_
n
ame() by def
i
nition groks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Hama
n
o
rerere
:
ma
k
e rr-cache fanout directory honor uma
s
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o
C Hamano
a
pp
l
y
:
d
ocument --3way
opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply: al
l
ow rerer
e
() to
w
ork on --
3
way results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: register conflicted stages to the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: --
3
way wi
t
h add
/
ad
d
confl
i
ct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
a
pply: move verify_index_
m
atch() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply
:
plug the three-w
a
y merge logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
man
o
apply: fa
l
l back on three
-
way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
Hamano
ap
p
ly: accept -3
/
--
3
way command
l
i
n
e
opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Ha
m
a
no
appl
y
:
move "already
e
x
i
s
ts" logic to
check_to_crea
t
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C Ham
a
no
apply: move check_to_
c
r
e
ate_blob() c
l
oser to it
s
sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply: f
u
rther s
p
lit load_preima
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
a
p
ply
:
refac
t
or
"
pre
v
i
ous patch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
apply: split load_prei
m
age() helper function
o
ut
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: f
a
ctor out chec
k
out_target() helper function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
aman
o
appl
y
: refactor read_file_or_git
l
ink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next