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
i18n: fmt-merge-msg: mark parseopt strings for translation
2012-07-16
Junio C Hamano
Merge branch 'jk/i
n
de
x
-pack
-
strea
m
i
n
g
-
fix'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
M
erge b
r
anch 'jk/
m
a
int-
c
ommit-ame
n
d-only-no-pa
t
hs'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C Hamano
Merge branch 'cw/a
m
end-
c
o
m
mit-
w
it
h
out-message'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C
H
ama
n
o
M
erge
b
ranch 'jn/makefile-
c
l
e
a
nup'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch
'ar/
c
l
o
n
e-honor-
u
mask-at-top'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Hamano
M
erge
branch
'
jc/apply-
3
way'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Hamano
Merge br
a
nch 'cw
/
re
b
ase-i-root'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merg
e
branch 'p
w
/
g
it-p4-move'
commit
|
commitdiff
|
tree
2012-07-15
Š
t
ěpán Něm
e
c
doc:
A
few
minor copy edits
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-14
Junio
C Hamano
Me
r
ge branch 'pw
/
git-
p
4-jobs
'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Haman
o
Merge branch
'
jk/push-del
e
te-r
e
f
-
err
o
r-message'
commit
|
commitdiff
|
tree
2012-07-13
Paul G
o
r
t
m
aker
am: ind
i
cate where a failed
patch is to be foun
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Sixth batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C Hamano
Merge
b
ranch
'
j
c/refactor-
d
iff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C Hamano
M
e
rge b
r
anch 'tg/ce-namel
e
n'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
ano
Merge
b
ranch 'tb/sanit
i
ze-decomposed-
u
tf-8-pathn
a
me
'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Hama
n
o
Merge branch '
m
m/
m
ediawik
i
-tests'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ham
a
no
Merge
b
ranch 'jn/vcs-svn'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Hamano
Me
r
ge branch 'mm
/
mediaw
i
ki-file-
a
ttachments'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Ha
m
ano
Merge branch
'tr/maint-show-walk'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
Merge
branc
h
'
m
z
/r
e
base-
n
o-mbo
x
'
commit
|
commitdiff
|
tree
2012-07-13
Jeff King
revision:
a
v
oid wor
k
after -
-
max-count i
s
reached
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
t
1512:
match the
"
other"
object names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Gary G
i
bb
o
ns
git p4: a
d
d sup
p
ort for 'p4 move
'
in P4Submit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Junio C H
a
man
o
t7003:
a
d
d tes
t
to
filter a branch with a commit
at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Ham
a
no
date
.
c: Fix
o
ff by one
e
rror in
o
bject-header date
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Jens Le
h
mann
submo
d
ules: don'
t
stu
m
ble over
s
ymbol
i
c links when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
t1
5
1
2
: i
g
nore whitespaces in
wc -l output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Alex
a
nder
Strasser
t4012: Unqu
o
te
git command
f
ragment i
n
test ti
t
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Alex
a
nder
Strasser
t4
0
12
:
modernize
s
ty
l
e for quotin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
R
educe
d
raft
r
e
lease notes to 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Sync w
i
t
h 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Git 1
.
7
.
1
1
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C H
a
man
o
Merg
e
br
a
nch 'jc/m
a
int-blame-unique-a
b
brev'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
i
o
C H
a
mano
M
erge b
r
anc
h
'rj/pla
t
form-prea
d
-may-b
e
-thread-un
s
a
f
e
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merg
e
branch 'th/dif
f
-no-inde
x
-
fixes' int
o
m
a
in
t
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C
Hamano
Merge br
a
nch
'nd/clone-s
i
ngle-fix' into ma
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
Merg
e
b
r
an
c
h
'
j
c/rev-list-simplify-mer
g
es
-
f
i
rst-par
e
nt
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge
b
ranch 'hv/submodule-
u
p
d
ate-n
u
ke-submodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
n
o
Merge bra
n
ch 'jk/d
i
ff-
n
o-index-pager' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'mm/verify-f
i
le
n
ame-fix
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch '
c
n/ch
e
rry-pick-range-docs' i
n
to
maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Ham
a
no
Merge branch
'
jc/ustar
-
chec
k
s
um-is-unsigned' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge bra
n
ch 'jc
/
bundle-complete-notice' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
a
mano
Merge branch 'jc/
l
s-files-i-d
i
r
'
into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
Mer
g
e branch 'jc/
r
equ
e
st-pull-ma
t
c
h-tagname' into maint
commit
|
commitdiff
|
tree
2012-07-11
Thomas Gummerer
Strip name
l
e
n
o
ut of ce_flags in
t
o
a ce_na
m
e
len f
i
e
l
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio
C
Ha
m
ano
M
erge branch 'tg/main
t
-cach
e
-
name-compare' into tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
cache_name
_
compare(): do not trunc
a
te while c
o
mpa
r
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Je
f
f Ki
n
g
ind
e
x-pack: l
o
op while inf
l
ating
objects in unpac
k
_dat
a
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Jeff
K
in
g
c
ommit
:
fi
x
"--amend
--only" with n
o
path
s
pe
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Junio
C Hamano
apply: tests for
the --3way opt
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Jeff King
add: create ADD_EDIT
.
patch with m
o
d
e
0666
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
fil
t
er-
b
ranch: do
n
ot forge
t
th
e
'@' prefix
t
o forc
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C H
a
m
a
n
o
r
ev-pars
e
--disa
m
biguate=<pref
i
x>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
mano
rev-parse: A and B
in "rev-parse A
.
.
B" refer to committ
i
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
reset: the command takes com
m
ittis
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
commi
t
-tree: the command wants a
t
ree and
c
ommits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply: --build-fake-ancestor e
x
pects
b
lobs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c:
add support
f
o
r
disa
m
biguat
i
ng ot
h
e
r
t
y
p
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
rev
i
si
o
n
.
c
:
the "lo
g
"
f
amily, ex
c
ept for "sh
o
w", takes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hama
n
o
revision
.
c: allow hand
l
e_
r
evision
_
arg()
t
o
t
ake o
t
her
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Ha
m
a
n
o
sha1_name
.
c:
introduce ge
t
_
sha1_
c
ommittish()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
sha
1
_
n
ame
.
c:
t
each
l
ookup context to get_sha1_with
_
c
o
ntext(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
sha1_
n
ame
.
c
:
many short n
a
mes can only b
e
com
m
ittish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
sha1_name
.
c
:
g
et
_
sha1
_
1
() tak
e
s looku
p
f
l
ags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c: get_d
e
scribe_n
a
me() by definition gr
o
k
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
r
e
rere: make rr-ca
c
he
fanout dire
c
tor
y
honor umask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: doc
u
me
n
t --3way o
p
tion
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:
allow
r
erere() to work on --3
w
ay results
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply
:
regist
e
r
confl
i
cted
s
tages to the index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply
:
--3way with add
/
a
dd conflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
mano
apply: move verify_index_match() higher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
a
p
pl
y
: plug the
thre
e
-way m
e
rge logic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: fall back
o
n three-way merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o C Hamano
apply: acc
e
pt -3/--3way comm
a
n
d li
n
e
o
pti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: move "already exists" lo
g
i
c to check_
t
o_cre
a
t
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
apply:
m
o
ve check_to_create_
b
l
o
b()
c
loser to its
sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
a
p
ply: further sp
l
it load_
p
r
e
image()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
apply: refacto
r
"previous
patc
h
" logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: split loa
d
_p
r
eimage() helper fu
n
ction ou
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: f
a
ctor out check
o
u
t
_targe
t
()
h
elper func
t
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
Ha
m
ano
apply
:
refactor re
a
d_file_or_gitl
i
nk()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
un
i
o C
H
a
m
a
no
ap
p
ly: clear_image()
c
lears thi
n
gs a bit
mor
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply
:
a
b
it more co
m
ment
s
on PATH_TO_BE_DELE
T
E
D
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Haman
o
apply: fix an incomplete comment in ch
e
ck_pa
t
ch(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
A
l
ex R
i
esen
Restore umasks influence
o
n th
e
p
ermissio
n
s of work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Chris Webb
Al
l
ow edit of empty
m
essage with commit
-
-amend
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Ham
a
no
Merge git://gi
t
hub
.
com/git-
l
1
0
n
/
git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Fi
f
th batc
h
fo
r
1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
am
a
no
Merge
b
ran
c
h 'cw/help-over
-
n
e
twork'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
ama
n
o
Merge branch '
m
z/empty
-
reba
s
e-test'
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o
C Hamano
Merge br
a
n
c
h
'
pw/git-p4-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Merge branch
'
j
s/fast-export-paths-with-sp
a
ces'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
Merge
branch '
c
w/no-
d
et
a
ching-an-unbor
n
'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
Merge br
a
nch 'vr/use-our-perl-in-te
s
ts'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
Merge br
a
nch 'mm/c
r
ed
e
ntia
l
-plumbing'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
Merge branch 'jc
/
maint-blame
-
unique-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge
branch 'jn/pe
r
l-make
m
a
k
e
r
-leading
-
paths
'
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C
H
amano
Mer
g
e branch 'rj/platf
o
rm-pread-m
a
y-be-th
r
ead-unsafe'
commit
|
commitdiff
|
tree
next