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 'sn/doc-typofix'
2012-07-24
Junio C
H
a
man
o
Me
r
ge branch 's
n
/d
o
c-typ
o
fix'
commit
|
commitdiff
|
tree
2012-07-24
Junio C Haman
o
Merg
e
branch 'tg/ce-namelen-field
'
commit
|
commitdiff
|
tree
2012-07-24
Junio C Hamano
Me
r
ge branc
h
'nk/maint-gitweb-
l
og-by-l
i
nes'
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o C Ha
m
ano
Update
d
raft release notes to 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-22
J
u
nio C Hamano
Sy
n
c
w
ith 1
.
7
.
1
1
.
3
commit
|
commitdiff
|
tree
2012-07-22
J
unio
C
H
a
mano
G
it 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-
e
rr
o
r-mes
s
a
ge
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
M
erge br
a
n
ch 'ar/clone-hon
o
r-um
a
s
k-
a
t-top'
into m
a
int
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge branch 'cw/amend-commit-with
o
ut-message' into
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Haman
o
Merge branch 'jk/maint
-
commit-
a
mend-
o
n
l
y
-no-pa
t
hs'
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
Hamano
M
erge branch 't
g
/maint-
c
ache
-
name-co
m
p
ar
e
' into m
a
in
t
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
Hamano
Merge
b
ranch 'tr/ma
i
n
t
-
show-
w
alk' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C
Haman
o
Merge branc
h
'jc/refactor-
d
i
ff-stdin' into maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C Ha
m
a
n
o
Merge branch 'mz/empty-rebase-t
e
st' into
ma
i
n
t
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge branch 'js/fast-export-pat
h
s-with-spaces' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Ham
a
no
Merge branch 'cw/no-detaching
-
a
n-un
b
orn' into m
a
in
t
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge branch 'vr/
u
se-our-perl-in-tests' into maint
commit
|
commitdiff
|
tree
2012-07-22
J
unio C
Hama
n
o
Me
r
ge git://
b
ogo
m
ips
.
org/git-s
v
n
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
Hamano
Me
r
ge bran
c
h
'
j
k
/revisi
o
n
-
w
alk-
s
t
o
p
-
at-
m
a
x
-count'
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io C
Hamano
Mer
g
e branch 'mm/
c
onfig-xdg'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge
b
r
anc
h
'
as/t
4
012-style
-
updat
e
s
'
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
Hamano
Merge branch 'pg/maint-1
.
7
.
9-am-whe
r
e
-
i
s
-patch'
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io
C Hamano
M
e
rge
branch '
j
l/mai
n
t-1
.
7
.
10-re
c
ur
s
e
-
submo
d
u
les-with
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C H
a
m
a
no
Mer
g
e branch
'ms/da
e
mon-doc-typo'
commit
|
commitdiff
|
tree
2012-07-22
J
u
nio C Hama
n
o
Merge branch 'lk/
m
o
r
e-h
e
lp
f
ul-status-hin
t
s'
commit
|
commitdiff
|
tree
2012-07-22
Junio C
Hamano
Merge b
r
a
n
c
h
'j
c
/sha1-name-more'
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C Hamano
Merge bra
n
ch 'jc/maint-fi
l
te
r
-branch-epoch
-
d
ate'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Update
draft release
notes for 7th batch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Junio
C Hamano
Merge
branch 'tg/maint-cache-name-co
m
pare'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
H
amano
Merge br
a
nch 'jk/index-pack-st
r
eaming-fix'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Me
r
ge bra
n
c
h
'jk/ma
i
nt-commit-amend-only-no-paths
'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C Hamano
Me
r
ge b
r
anch 'cw/ame
n
d-commit-without-messag
e
'
commit
|
commitdiff
|
tree
2012-07-16
J
u
n
io C H
a
m
a
no
Mer
g
e
b
ran
c
h
'
jn/mak
e
file-cleanup'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch 'a
r
/clone-honor-uma
s
k-at-top'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C
Ham
a
no
M
erge branch
'
jc/app
l
y-3
w
ay'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hama
n
o
Mer
g
e
branch 'cw/
r
ebas
e
-i-root'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C Hamano
Merge
branch 'pw
/
git-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
Merge bra
n
ch 'pw/git-p4-j
o
bs
'
commit
|
commitdiff
|
tree
2012-07-14
J
u
nio C Hamano
Merge bran
c
h '
j
k/pus
h
-delete-ref-error-mess
a
ge'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Hamano
Sixth b
a
tch for 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C Ha
m
ano
Merge br
a
nc
h
'jc/refactor-diff
-
stdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Haman
o
Merge
b
r
a
nch 'tg/c
e
-
n
a
m
elen'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C
Hama
n
o
Merg
e
bran
c
h 'tb/sa
n
it
i
ze-decompo
s
ed-utf-8-pathnam
e
'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Hamano
M
er
g
e
b
r
anc
h
'mm/me
d
i
awiki
-
test
s
'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io
C
H
a
mano
Merg
e
b
r
anc
h
'jn/vcs-sv
n
'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C Hamano
Merge branch
'
mm/media
w
ik
i
-file-a
t
t
achm
e
nts'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Haman
o
Merg
e
b
r
a
n
ch 'tr/mai
n
t-show-walk
'
commit
|
commitdiff
|
tree
2012-07-13
J
u
ni
o
C Hamano
Merg
e
branch 'mz/rebase-no-
m
box'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
t151
2
: match the "
o
th
e
r"
o
bject
names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio
C Ha
m
ano
t7003: add t
e
st to f
i
lt
e
r a branch
w
i
th a
commit
a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Hamano
date
.
c: Fix off by one err
o
r in obje
c
t
-
header date
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
t151
2
: ig
n
ore w
h
i
t
e
spaces in wc -l
o
utput
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Reduce draft re
l
ease
n
otes
to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Ham
a
no
Sync with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C
H
am
a
no
G
i
t 1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
man
o
Merge bra
n
ch
'
jc/maint-bl
a
m
e-unique-abbrev' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
J
un
i
o C Hamano
M
e
r
ge branch 'rj/platfor
m
-pre
a
d
-
m
ay-be-
t
hread-u
n
sa
f
e
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
H
ama
n
o
Merge branch 'th/
d
i
ff-n
o
-i
n
dex-
f
ixe
s
' into main
t
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Ham
a
no
Merge
br
a
nch 'nd/clone-
s
ingle-fix
'
i
n
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
e
rge bra
n
ch
'
jc/rev-
l
ist-simpl
i
fy-merges-f
i
rst-par
e
nt
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branc
h
'hv/sub
m
odule-update-nuke-subm
o
dules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Merge branch 'jk/d
i
ff
-
n
o-index-pager' into
m
ai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hama
n
o
Merge
b
ranch 'mm/verify-f
i
lename-fix' into m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branc
h
'cn/che
r
r
y-
p
ick-range-docs' into maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io
C
Hamano
M
erge branch 'j
c
/
ustar-ch
e
cksu
m
-
i
s
-
unsigned' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Merge
b
r
an
c
h 'jc/bu
n
dl
e
-c
o
m
p
lete-notice' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
erge branch 'jc/ls-files-i-dir' into
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Mer
g
e branch 'j
c
/re
q
ues
t
-pull-match-tagname' into
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Mer
g
e b
r
anch 't
g
/maint-cach
e
-name-compare' into tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
cache_name
_
compare(): do n
o
t truncate while comparing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Jun
i
o
C Hamano
ap
p
l
y
:
tests for
t
he --3wa
y
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Haman
o
filter-
b
ranch
:
d
o
not f
o
rget the '@
'
p
refix
to f
o
rce
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
rev-parse --disambiguate=<pref
i
x>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C
Ham
a
no
rev-parse: A and B in "re
v
-parse A
.
.
B" refer to committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
re
s
e
t: t
h
e command takes committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
commit
-
tree: the com
m
an
d
wants
a
tree and
c
omm
i
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
a
pply: --bu
i
l
d
-fake-ancestor expect
s
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
pport fo
r
disambiguating other typ
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
revi
s
i
on
.
c: the "log" fam
i
ly, except
f
or "show",
t
a
k
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
revision
.
c: al
l
ow han
d
le_
r
evision_arg() to take
ot
h
er
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Ha
m
ano
sha1_nam
e
.
c: introduce ge
t
_sha1_
c
ommitt
i
sh()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
sha1_name
.
c:
t
each lookup c
o
n
text to
get_sha1_with_contex
t
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
s
ha1_name
.
c: many short nam
e
s can
only
b
e c
o
m
m
ittish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
sh
a
1_name
.
c
:
get_sha1_1() takes lookup
fla
g
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c: get_describe_name() by definiti
o
n gro
k
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rerer
e
:
m
ake rr-ca
c
he fanout directo
r
y honor
u
mask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
H
a
m
ano
apply:
d
ocument --3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
pply: allow rere
r
e() t
o
work
o
n --3w
a
y resu
l
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
ap
p
ly: regist
e
r conf
l
icted stages to 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 ad
d
/add conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply:
m
ove verify_in
d
ex_match() hig
h
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
ama
n
o
apply: plug the three-way
merg
e
logic i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
appl
y
:
fall
ba
c
k on three-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hama
n
o
apply: a
c
cept
-
3/
-
-3way comma
n
d line opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hamano
a
p
ply: mo
v
e
"al
r
e
a
dy exists"
l
ogic
t
o c
h
eck_
t
o_cr
e
ate(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
ap
p
l
y: move che
c
k_to_create
_
b
lob() closer to it
s
sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
amano
apply: furth
e
r split l
o
ad_prei
m
ag
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: refac
t
or "previous patch"
l
o
gic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
H
a
m
ano
apply: split
l
o
a
d_preimage() helper f
u
n
c
tion out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: fact
o
r o
u
t checkout
_
targ
e
t() helper function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next