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 git://github.com/git-l10n/git-po to update Swedish translation
2012-07-16
Junio
C
Hamano
Merge br
a
nch '
t
g/maint-
c
ache
-
n
a
m
e
-
compare'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C Hamano
Merge branch
'
jk/
i
ndex-pack-strea
m
i
ng-
f
ix'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hama
n
o
M
e
r
g
e
branch 'jk/maint-comm
i
t-amend-only-no-paths
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ha
m
ano
Merge
b
ranch
'
cw/amend
-
commit
-
w
i
t
ho
u
t
-message'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hama
n
o
Mer
g
e bra
n
ch '
j
n/makef
i
le-cl
e
anup
'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C Hamano
Merge branc
h
'ar/clone-honor-umask-at-top
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
H
amano
Merge branch
'
j
c/a
p
p
ly-3way'
commit
|
commitdiff
|
tree
2012-07-16
Junio C H
a
mano
Merge
b
ranch 'cw/r
e
base-i-root'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge br
a
nch 'pw
/
g
it-p4-m
o
ve'
commit
|
commitdiff
|
tree
2012-07-14
Jun
i
o C H
a
mano
Me
r
ge
branch 'p
w
/git-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Haman
o
Merge br
a
nch 'jk/pu
s
h-delet
e
-
ref
-
error-
m
es
s
age'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C
Hama
n
o
Six
t
h batc
h
for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
ano
Merge
b
ranch '
j
c/refactor-diff-s
t
din'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Hamano
M
e
r
ge branch 'tg/
c
e-namelen'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C H
a
mano
Merge
b
ra
n
ch 't
b
/sani
t
ize-
d
e
composed-utf-8-
p
athname'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Ham
a
n
o
Merge branch 'mm/me
d
i
a
w
iki-tests
'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C Hamano
Merge branch 'jn/vcs-s
v
n'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
M
e
r
g
e branch 'mm/mediawiki-file-at
t
achments'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C Hamano
Merg
e
bran
c
h 'tr/ma
i
nt-show-walk'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
M
e
rg
e
b
ranch '
m
z/rebase-no-mbox
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
amano
t
1512
:
match
the "other
"
object n
a
mes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Junio
C
Ham
a
no
t7003:
add test to filter a branch
w
ith
a commit at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Haman
o
da
t
e
.
c:
F
ix of
f
by one erro
r
in object-header
d
ate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
t
1
512:
ignore whitespaces in w
c
-l out
p
ut
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
Reduce draft
r
ele
a
se no
t
e
s to 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
S
y
nc with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Haman
o
Git
1
.
7
.
11
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge br
a
nch
'jc/maint-blame-unique
-
ab
b
rev' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Haman
o
M
erge
branch 'rj/p
l
a
t
f
orm-pread-may-
b
e
-
threa
d
-
u
ns
a
fe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'th
/
diff-no-index-
f
ixes' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Ham
a
no
Merge b
r
anch 'nd/clone-si
n
gle-f
i
x
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C
Hamano
Merg
e
branch '
j
c/rev-l
i
st-simplify-merg
e
s-first-pa
r
ent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Merg
e
b
ranch 'hv/su
b
module-u
p
date-nuke-submodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Merge
b
r
anch
'jk/diff-no-index-pag
e
r' i
n
to
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
Merge branch 'mm/verify-filename-fix' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Merge br
a
nch '
c
n/che
r
ry-
p
ick-range
-
docs'
i
nto
main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jc/ustar
-
c
hecksu
m
-is
-
u
n
signed' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
M
erg
e
branch 'jc/bundle-complete-notice' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
e
rge
b
ranch 'jc/
l
s-f
i
les
-
i
-
dir' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Merge b
r
anch '
j
c/requ
e
s
t-pull-match-tagn
a
me' into maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Merge branch
'
tg
/
mai
n
t-cache
-
n
a
m
e-compare
'
i
n
to t
g
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
cache_name_co
m
pa
r
e(
)
: do not truncate whi
l
e
comparing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
apply:
t
ests for
t
he --3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Ju
n
i
o
C H
a
mano
f
i
l
t
er
-
b
r
anch: do not forget the '@' pre
f
ix to force
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
Hamano
rev-parse
-
-disambiguate=<prefix>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
ma
n
o
rev-pa
r
se: A an
d
B
i
n "rev-parse A
.
.
B" refer to
comm
i
ttish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
res
e
t: the comma
n
d takes c
o
m
m
itti
s
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
com
m
it-tree: the command wan
t
s a tree and commits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
apply:
--b
u
ild-fake-ancestor expe
c
ts
blobs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
mano
s
h
a1_name
.
c: add supp
o
r
t fo
r
disambiguating other types
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
revision
.
c:
t
he "l
o
g
" family, except
f
or "show",
takes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
r
e
vision
.
c:
allow handle_rev
i
sion_arg() to take other
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io
C Hama
n
o
sha1_name
.
c:
i
ntroduce get_sh
a
1_committ
i
sh()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
s
ha
1
_name
.
c:
t
e
ach lookup c
o
ntex
t
to get_
s
ha1_
w
it
h
_context()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_
n
a
m
e
.
c
: many short na
m
es can only be committish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c: get_sha1_1() t
a
kes lookup fl
a
gs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c: get_describ
e
_name() b
y
d
efinition groks
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
re
r
ere: make rr
-
cache f
a
n
o
u
t directory
honor u
m
ask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
d
o
cume
n
t --3wa
y
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
H
amano
apply: al
l
ow r
e
rer
e
(
)
to
w
o
r
k on --3
w
ay
res
u
lt
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply
:
re
g
i
s
ter conflic
t
ed 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 Hamano
a
pp
l
y: --3way with add/add
c
o
n
flict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: move verify
_
index_match() hig
h
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Ham
a
no
apply: pl
u
g
t
he three-way merge logic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply: fall back on
t
h
ree-way
m
e
r
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: accept -3/--3way c
o
mma
n
d line option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
apply: move "
a
l
ready exists"
logic
t
o check_to_create()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply: move che
c
k_to_
c
reate_blob() clos
e
r t
o
i
t
s
s
ole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: f
u
rthe
r
split load_preimage(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ham
a
no
app
l
y: refac
t
or "pre
v
ious pat
c
h
" logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
ano
apply:
s
pli
t
load_preimage() helper function out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
factor out checkout_targ
e
t()
hel
p
er
f
unction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply: refactor
r
ead_file_or_
g
it
l
ink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
apply
:
clear_ima
g
e() clears thi
n
gs a bit mo
r
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hama
n
o
apply: a bit more comment
s
on PATH_TO_BE_DELETED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply
:
fix
an
i
ncomp
l
e
te comment in check_pat
c
h
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ha
m
ano
Merge git://git
h
ub
.
com/git-l10n
/
g
i
t-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
F
ifth
b
atc
h
fo
r
1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
Merge branch 'cw/help-over-network'
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C Hamano
Merge br
a
nc
h
'mz/empty
-
rebase-tes
t
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merg
e
branch
'pw/g
i
t
-
p4-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
Merge b
r
anch 'js/fast-
e
xport-paths-w
i
t
h
-
spaces'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
M
erge br
a
nch 'cw/
n
o-d
e
tach
i
ng-an-un
b
orn'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
H
amano
Merge branch 'vr/us
e
-o
u
r-pe
r
l-in-te
s
ts'
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Haman
o
Merge br
a
nch 'm
m
/credential-plumbing'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ha
m
ano
Merge
b
ran
c
h 'jc/maint-b
l
ame-unique-abbrev
'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
amano
Merge
b
ra
n
ch 'jn/perl-mak
e
make
r
-leadin
g
-paths'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
M
e
rge
b
ra
n
ch '
r
j
/
pla
t
form-pread-ma
y
-be-thr
e
a
d-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Haman
o
M
e
rg
e
b
ranch 'mm
/
config-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Junio
C
Hamano
Fourth batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge branch 'nd/clone-sin
g
le-
f
ix'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge
branch 'th/diff-no-index-fixe
s
'
commit
|
commitdiff
|
tree
2012-07-05
J
u
nio C Hamano
Mer
g
e bran
c
h 'hv/remot
e
-end-hung-up'
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_name
.
c
:
teach get_short_
s
ha1()
a
commit-only
o
pti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C
H
amano
sha1
_
nam
e
.
c: al
l
ow get_short_sha1() to take other flags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
J
u
nio C Hamano
get_sha1(
)
:
fix error
s
tatus regression
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Ju
n
io C Haman
o
sha1_n
a
me
.
c: restructure disambiguation of short n
a
m
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Jun
i
o C
H
a
m
ano
sha1_name
.
c: co
r
r
e
c
t mi
s
named "canoni
c
al" and "res"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Ham
a
n
o
s
ha1_name
.
c: refactor find_short_packed_object
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Jun
i
o
C Ham
a
no
sha
1
_n
a
me
.
c: rename "now" to "
c
urrent"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next