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
b
ranch '
t
g/main
t
-ca
c
he
-
name-c
o
mpare'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
H
amano
Merge branch 'jk/inde
x
-
pack-streaming-fix'
commit
|
commitdiff
|
tree
2012-07-16
J
uni
o
C
H
a
m
ano
Merge bra
n
ch
'
jk/ma
i
nt-c
o
mm
i
t
-
amend-only-no-
p
aths'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C
H
amano
Merge
b
ran
c
h 'cw/amend-
c
o
m
mit-w
i
th
o
ut-mes
s
a
g
e
'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C Hamano
M
e
rge br
a
nch
'
jn/m
a
ke
f
ile-cleanup'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
Hamano
M
erge bra
n
c
h
'
a
r/clone-
h
onor-umas
k
-at-top'
commit
|
commitdiff
|
tree
2012-07-16
J
un
i
o C Hamano
Merge
b
ranc
h
'jc/apply-3way
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
M
erge
b
ranch 'cw/reba
s
e-i-ro
o
t'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C Hamano
Merge
branch 'pw/git-p4-m
o
ve'
commit
|
commitdiff
|
tree
2012-07-14
J
u
nio C Hamano
Merge bra
n
ch 'pw/
g
i
t
-p
4
-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Junio
C
Hamano
M
erge
branch 'jk/push-delete-ref-error
-
message
'
commit
|
commitdiff
|
tree
2012-07-13
Junio 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
J
u
n
i
o C Hamano
M
erge branch 'jc/
r
e
f
actor-diff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Hamano
Merge
b
ranch 'tg/ce-
n
a
melen'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
ano
Merge branch 'tb/sanitize-decomposed-utf-8
-
pathname'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merg
e
branch 'mm/mediawik
i
-t
e
sts'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
Me
r
ge br
a
nch
'jn/vc
s
-s
v
n'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C
H
amano
Merg
e
branch
'
mm/mediawi
k
i
-file-attachme
n
ts'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C
Ha
m
ano
M
erge
branch 't
r
/maint-show-walk'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Haman
o
Merge branch 'mz/rebase-no-mb
o
x'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
t15
1
2: match the "other" o
b
ject names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
J
u
n
i
o
C Ha
m
ano
t
7
0
03: add t
e
st to filter a branch with a commit
at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
J
uni
o
C Hamano
date
.
c: Fi
x
o
ff by o
n
e e
r
ror
i
n
object-he
a
d
er date
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
t1512: i
g
nore whitespaces in wc -l output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
R
educe draf
t
r
elease n
o
tes to 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
H
a
m
ano
S
ync with 1
.
7
.
1
1
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Git 1
.
7
.
11
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
Ham
a
n
o
Merge bra
n
ch '
j
c/maint
-
blame-unique-abbrev'
int
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
Merge b
r
anch 'rj/platform-pr
e
ad-may-be-thread-u
n
safe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C
H
a
mano
M
e
r
ge
b
ranch 'th/diff-n
o
-i
n
dex-fi
x
es' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Merge bran
c
h 'nd/
c
lone-
s
ingle-fix' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge
b
r
anch 'jc/rev-list
-
sim
p
lify-merges-
f
irst-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hama
n
o
Merge branch 'hv/submodule-upda
t
e
-nuke-su
b
modules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
M
erge branch
'
jk/diff-no-in
d
ex-pager' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Merg
e
bran
c
h 'mm/v
e
rify-filenam
e
-fix'
into main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge
bra
n
c
h 'cn/c
h
er
r
y-pi
c
k
-
ran
g
e-do
c
s'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Merge branch '
j
c/u
s
tar-checksum-is-unsigned' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C H
a
ma
n
o
M
erge
branch 'jc/b
u
ndle-complete-no
t
ice' int
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge
b
ranch 'jc/
l
s-files-i-dir' into maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Merge bra
n
ch 'jc
/
request-pull-match-tagn
a
me' into main
t
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io C Hamano
Merge branch
'
tg/main
t
-cache-name-compare' int
o
tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C
Hamano
cache_name_compare():
do not trunca
t
e
w
hile comp
a
ring
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
J
unio
C
Hamano
apply: tests for the --3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Ju
n
io
C
Ham
a
no
filte
r
-branch: do
n
o
t fo
r
g
et the '@' prefix t
o
fo
r
ce
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
r
ev-parse --disambigua
t
e=<prefix>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
rev
-
parse: A
and B in "rev-
p
arse A
.
.
B" refer
t
o committ
i
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C Haman
o
reset: the comm
a
nd takes committish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Ham
a
no
c
ommit-tree: t
h
e
command wa
n
ts
a
t
r
ee
and commi
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
:
--build-fake
-
ancestor expects b
l
obs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
sha1
_
n
ame
.
c: add support for
d
isambiguating oth
e
r types
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Hamano
rev
i
sion
.
c: the "log" family,
e
xce
p
t for "show"
,
takes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
revisi
o
n
.
c: allow handle_re
v
is
i
on_ar
g
() to ta
k
e other
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
sha1_name
.
c: introduc
e
get_sha1_committish()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c
: teach looku
p
context to
get
_
sha1_with_c
o
ntext(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C H
a
mano
s
h
a1_nam
e
.
c:
m
any short n
a
m
e
s
c
an only
b
e committish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
sha1_name
.
c: get
_
sha1_1()
t
akes l
o
okup 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_descr
i
be_n
a
m
e
(
) by de
f
initi
o
n
g
r
oks
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
a
n
o
rerere: make
r
r-cache fanout
d
irectory honor umask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: docu
m
ent --3way optio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C H
a
m
a
no
app
l
y: allow
rerere() to
work o
n
--3
w
ay results
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C H
a
m
a
no
ap
p
ly: re
g
ister conflicte
d
stages to the in
d
ex
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: --
3
w
a
y wi
t
h add/add
c
onfli
c
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
Haman
o
a
p
ply: move verify_
i
nde
x
_match() h
i
g
h
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
a
p
ply: plug the thre
e
-wa
y
merg
e
logic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C H
a
mano
apply
:
fall
back on th
r
ee
-
way
m
e
r
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
app
l
y: accept -3/--3way co
m
mand l
i
n
e option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: move "
a
l
re
a
d
y
exists" log
i
c to check_to_create()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
app
l
y: mo
v
e
c
heck_to_create
_
b
l
ob() close
r
to its sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply: further split load_preimage()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
H
a
m
ano
ap
p
ly: refactor "previous patc
h
" logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
apply: split lo
a
d_preimage() hel
p
er
f
unction
o
ut
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply: fa
c
t
o
r
o
u
t
c
h
e
ckout_targ
e
t
() helper function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ham
a
n
o
apply: r
e
factor
r
e
ad_f
i
le_o
r
_g
i
t
l
ink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ham
a
no
apply
:
clear_
i
m
a
ge() clears
t
h
ings
a bit
m
o
re
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C
Ham
a
no
ap
p
ly: a
b
it more comments 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
ncomplete co
m
me
n
t in che
c
k_patch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merg
e
git:
/
/github
.
com
/
git
-
l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
Fif
t
h batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Merge
b
ranch 'cw/help-over-network'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'm
z
/empty-rebas
e
-test'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
Merge branch 'pw/gi
t
-p
4
-test
s
'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Haman
o
Merge branch 'js/
f
ast-expor
t
-paths-with-spaces'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
Ha
m
ano
Merg
e
branch 'cw/no-detach
i
ng-a
n
-unborn'
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
H
am
a
n
o
M
er
g
e bran
c
h 'mm/credent
i
al-pl
u
mbing'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
M
e
rge br
a
nch 'jc/mai
n
t
-blame-uniqu
e
-
ab
b
rev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge b
r
a
n
ch 'jn/
p
e
r
l-make
m
ak
e
r-l
e
ading-paths'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C Hamano
Merge
branch
'
rj
/
plat
f
orm-pread-may-be-th
r
ead-unsafe
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
man
o
M
e
rge branch 'mm/confi
g
-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Jun
i
o C
Hamano
F
ou
r
th batch for
1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Junio
C
Hamano
Me
r
ge
b
r
a
n
ch
'
nd/clone-singl
e
-
f
ix'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Ham
a
no
Merge b
r
anch 'th/diff
-
no-index-fixes'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Ha
m
an
o
Merge
b
ranch 'hv
/
remote-end-hung-up'
commit
|
commitdiff
|
tree
2012-07-03
Junio C Ha
m
ano
sha1_
n
ame
.
c:
t
each get_short_sha1() a
commit-
o
nl
y
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C Hamano
sh
a
1
_
name
.
c: allow get_short_s
h
a1
(
) to ta
k
e
o
ther
flags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
g
e
t_sh
a
1()
:
fix
error sta
t
u
s r
e
gression
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sh
a
1_name
.
c: re
s
tructu
r
e d
i
sambigu
a
t
i
o
n of sh
o
rt n
a
m
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
J
unio C Haman
o
s
ha1_name
.
c: correct
m
isname
d
"c
a
n
onical" and "res"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Haman
o
sha1_name
.
c: refactor find_
s
hort_pack
e
d_obje
c
t(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Ha
m
ano
sha1_
n
ame
.
c:
r
en
a
me "now"
to "
c
u
r
r
ent"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next