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
Git 1.7.12-rc2
2012-07-16
J
unio
C Hamano
Me
r
ge br
a
n
ch 'pw/git-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Junio
C
Hamano
Merge bra
n
ch 'pw/git-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hama
n
o
Mer
g
e
b
ranch 'jk/push-
d
elete-ref-er
r
o
r-messa
g
e'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C
Hamano
Six
t
h batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Hamano
Merg
e
bra
n
ch 'j
c
/ref
a
ct
o
r-diff-std
i
n
'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io
C Haman
o
Merg
e
branch 'tg/ce-namelen'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
Mer
g
e br
a
nch 'tb/
s
anitize-deco
m
pos
e
d-utf-8-pa
t
h
name'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o
C Hamano
M
e
rge
branch '
m
m/medi
a
wiki-test
s
'
commit
|
commitdiff
|
tree
2012-07-13
J
u
n
io C Hamano
Merge branch 'j
n
/vcs-svn'
commit
|
commitdiff
|
tree
2012-07-13
J
unio
C
Hamano
Merge bra
n
ch 'mm/mediawiki-file-attachme
n
t
s'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Ha
m
ano
Merge branch '
t
r/maint-show-walk'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merg
e
branch 'm
z
/rebase-no-m
b
ox'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
t1512: m
a
tch the "o
t
her" o
b
ject names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio
C
Haman
o
t7
0
03
:
add test to fil
t
er 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
d
ate
.
c: Fix
o
f
f
by one error i
n
o
bjec
t
-header d
a
te
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
t15
1
2:
i
gnore wh
i
tespaces i
n
wc -l outpu
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Ham
a
no
R
educe draft relea
s
e not
e
s to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Sync with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
J
u
ni
o
C H
a
mano
Git 1
.
7
.
1
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Me
r
ge branch 'jc/maint-blame-uniq
u
e-ab
b
r
ev' into m
a
in
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge br
a
nch 'rj/platform-pread-
m
ay-b
e
-thread-
u
n
s
afe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
n
o
Me
r
ge branch
'th/d
i
ff-no-index-fixes
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Merge branch 'n
d
/
c
lone-si
n
gle-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
H
amano
M
erge bra
n
ch 'jc/rev-list-si
m
plify-m
e
rges-first-pa
r
ent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio
C
Ha
m
ano
Merge branch 'hv/submod
u
le
-
update-nuke-submodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io
C
H
a
m
ano
M
er
g
e branch 'jk/diff-
n
o
-
index-
p
a
ge
r
' into
m
a
i
nt
commit
|
commitdiff
|
tree
2012-07-11
J
u
ni
o
C
Hamano
Merge bran
c
h 'mm/verify-fil
e
nam
e
-fix'
i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
Merge bra
n
ch 'cn/cherry-p
i
ck-range-docs' i
n
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
Hamano
Merge bran
c
h
'jc/ustar-checksum-is-uns
i
gned' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C
Ham
a
no
Merge b
r
anch
'jc/bundle
-
complete-notice' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Me
r
g
e bra
n
ch 'jc/
l
s-files-i-dir' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jc/request-p
u
l
l
-mat
c
h-tag
n
a
m
e' i
n
to
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Merg
e
branch 'tg/main
t
-
c
ache-name-compare
'
into tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
c
ach
e
_name_compar
e
(): do not tr
u
ncate while c
o
mpar
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C
Hama
n
o
apply: tests for the --3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
fil
t
er-br
a
nch: do not
f
orget
t
he '@' prefix to
f
orce
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
rev-parse --disa
m
big
u
ate
=
<pr
e
fix>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rev-parse:
A and B in "re
v
-parse A
.
.
B"
refer to committis
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C Hama
n
o
reset: the co
m
mand takes committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
com
m
it-tree: the
c
ommand wants a tree
a
n
d
c
omm
i
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply:
-
-build-fake-ancestor expects blobs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C H
a
m
a
no
sha1_name
.
c: a
d
d support
f
or disambiguating other types
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
revisio
n
.
c: t
h
e
"
log" fam
i
l
y
, except for "show
"
, ta
k
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
Ha
m
ano
revision
.
c: allow handle_revision
_
arg
(
) to take
o
ther
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
s
ha1_name
.
c: int
r
oduce
ge
t
_sha1_c
o
mmittish()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
sha1_name
.
c:
tea
c
h
l
ookup context to g
e
t
_s
h
a1_with_con
t
ext()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c:
many shor
t
nam
e
s can only be committ
i
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
a
m
a
no
s
h
a1_
n
ame
.
c: get_s
h
a1_1()
t
akes lookup
f
lags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
a
no
sha1_name
.
c:
g
e
t
_
d
escribe_name() by
definition
groks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hama
n
o
r
e
rere: make rr-cac
h
e fanout directo
r
y
h
onor uma
s
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
ap
p
l
y
: document
-
-3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
apply: allow rerer
e
() to work on -
-
3way
r
e
s
ults
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply: re
g
i
s
ter con
f
licted s
t
ages t
o
the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: --3wa
y
with ad
d
/add c
o
nflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
H
am
a
no
apply:
m
ove v
e
rify_index_m
a
tch() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C Ha
m
ano
apply: plug the
t
hree-way
m
erge logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
app
l
y: fall ba
c
k on three-
w
ay merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
app
l
y: acc
e
pt -3/--3way com
m
and
l
ine
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
apply
:
m
o
ve "already ex
i
sts" l
o
g
i
c to
c
heck_to_c
r
eate()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
a
pply: move chec
k
_to_cre
a
te_bl
o
b()
closer to its sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: further
s
p
lit load_p
r
e
i
m
age()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
app
l
y: re
f
ac
t
or "previous patch"
l
o
g
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: split load_preima
g
e() hel
p
er function out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply: factor out checkout_target() hel
p
er fun
c
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C H
a
ma
n
o
app
l
y
: refactor rea
d
_file_or_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
ap
p
ly:
c
lear_image() clear
s
t
h
ings a b
i
t
more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Hamano
a
pp
l
y: a bit more comments on PATH
_
TO_BE_
D
ELETE
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
H
amano
a
p
ply: fix
a
n i
n
complete comment in
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://githu
b
.
com/gi
t
-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Fifth batc
h
fo
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
a
no
Merge br
a
nch 'cw
/
help-over-network'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
ano
Merge bra
n
ch 'mz/empty
-
reba
s
e-te
s
t'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
Merg
e
branch 'pw/git-p4-tests
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
er
g
e branch 'js/fast-expor
t
-paths-
w
ith-spaces'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Merge branch '
c
w/no-detaching-an-
u
n
born'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'vr/use-our-perl-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
M
erge branch 'm
m
/credent
i
al-p
l
u
m
bing'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
Merge branch 'jc/maint-bl
a
m
e
-uniq
u
e
-
a
bbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
aman
o
Merge branch 'jn/perl-m
a
k
e
ma
k
er-leading-paths'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
Hamano
Merg
e
b
r
a
nch 'rj/p
l
atform-p
r
e
ad
-
m
ay-be-t
h
read-un
s
afe'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hama
n
o
Merge branch 'mm/config-x
d
g
'
commit
|
commitdiff
|
tree
2012-07-05
Junio C H
a
mano
F
ourt
h
batch
f
or 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Junio C Ha
m
an
o
Merge branch
'
nd/clone-single-
f
ix'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge
b
r
a
n
ch 'th/d
i
ff-
n
o-
i
ndex-fixes'
commit
|
commitdiff
|
tree
2012-07-05
Junio
C
H
a
mano
Merge branch 'hv/remot
e
-en
d
-hung-up'
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hama
n
o
sha1_nam
e
.
c: teach ge
t
_s
h
ort_sha1() a commit-o
n
ly
o
ption
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
t
ake o
t
her flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C
H
amano
g
et_sha1():
f
ix er
r
or
s
tatus regr
e
ssion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1
_
name
.
c
:
restructure dis
a
mbiguation of shor
t
n
ames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
s
h
a
1_name
.
c: correct misnamed
"
can
o
nical" and "res"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
J
unio C Hama
n
o
sha1_name
.
c: re
f
actor find_s
h
o
r
t_packe
d
_object()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
J
unio C Ha
m
a
no
sha1_name
.
c
:
r
ename "now"
t
o
"curren
t
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Ju
n
io C Hamano
sha1_name
.
c: clarify what "fake"
is
for in find_sh
o
rt_obje
c
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C Ham
a
no
sha1_name
.
c: get
rid of ge
t
_sha1_wit
h
_mode
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Ha
m
ano
sha1_na
m
e
.
c: get
rid
o
f get_sha1_with_mode_1(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
J
unio C
Hamano
Sync
w
ith i18n-po upda
t
es in
m
ain
t
# Via
Junio C Hamano
(1) and Peter Krefting (1)
commit
|
commitdiff
|
tree
2012-07-02
Junio
C
Hamano
Me
r
ge branch 'ma
i
n
t
' o
f
git://g
i
thub
.
c
om/
g
i
t-l10n/g
i
t
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
J
u
nio
C
Ha
m
ano
sha
1
_
name
.
c: hide get_sha1_with_c
o
nt
e
xt_1() ugli
n
es
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
Junio C H
a
mano
blame: compute abbreviation width that ensures u
n
i
q
ue
n
ess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
d
i
f
f
-index
.
c: "git diff" has no need to re
a
d blob f
r
om
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next