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://git.bogomips.org/git-svn
2012-07-16
Matthieu Mo
y
git-remot
e
-mediawiki:
pr
o
perl
y
dea
l
w
it
h
invali
d
r
e
mo
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Matthieu Moy
git-
r
emot
e
-mediaw
i
k
i
: show progress information when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Matthieu Moy
git-remote-mediawik
i
:
s
how pro
g
ress
i
nformation when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Ma
t
thieu Moy
git-remote
-
mediawiki: use
--force w
h
en adding notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
M
atthieu
M
oy
git-remote-me
d
i
a
wi
k
i: get
r
id
of O
(
N^2) loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Matthieu Moy
git-
r
emote-med
i
a
w
iki: make medi
a
fil
e
s e
x
port
o
ptional
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Ma
t
thieu Moy
g
it-r
e
mote-m
e
d
iawi
k
i: actually send empty comm
e
nt when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Matthieu Moy
git-re
m
ot
e
-mediawiki:
d
o
n'
t
s
p
l
it names
p
aces w
i
th spaces
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Matthie
u
Moy
config: fix sev
e
ral
a
ccess(N
U
L
L
)
c
a
lls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
M
i
c
hael Schub
e
rt
Docum
e
ntation/
g
i
t-d
a
e
mon: add missing w
o
rd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Jeff K
i
n
g
s
tatus: color in-progre
s
s
m
es
s
age like other header
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Junio
C Hamano
Update draf
t
release n
o
tes
f
or 7th batch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Mer
g
e branch '
t
g/mai
n
t-cache-name-compare'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C Hamano
M
erge branch 'jk/in
d
ex-pa
c
k-st
r
eam
i
ng-f
i
x
'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C Haman
o
M
erge
b
r
anch 'jk/maint-commit-ame
n
d-onl
y
-no-paths'
commit
|
commitdiff
|
tree
2012-07-16
J
u
n
i
o
C Ham
a
n
o
Merge branch
'
cw/
a
mend-com
m
it-without-mes
s
a
g
e'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C H
a
mano
Merge branch
'
jn/makefile-clean
u
p'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C Hamano
Merge b
r
anch
'
a
r/cl
o
ne-honor-u
m
ask-at-top'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
M
e
rge bra
n
ch 'jc/apply-3
w
ay'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branc
h
'cw/rebase
-
i
-r
o
o
t
'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C Hamano
Merge
branch 'pw/
g
it-
p
4-move'
commit
|
commitdiff
|
tree
2012-07-15
Štěpán Ně
m
ec
doc: A few minor copy edit
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-14
J
unio C Hamano
Merge bran
c
h
'
pw/git-p
4
-j
o
bs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Ha
m
ano
Merge branch
'jk/p
u
sh-delete-ref-error-message'
commit
|
commitdiff
|
tree
2012-07-13
Paul Gortmaker
am: indicate where
a failed p
a
tch
is
t
o be found
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
J
u
ni
o
C Hamano
Sixth batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
J
unio
C
Hama
n
o
Merge b
r
anch
'jc/refactor-
d
iff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branch
'tg/ce
-
namele
n
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge bran
c
h
'tb/sanitize-decom
p
osed-utf-8-pathname
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
a
no
Merge branch 'mm/m
e
diawiki
-
t
e
s
ts
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge
b
ranch 'jn/
v
c
s-svn'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C
H
a
m
ano
Merge bra
n
ch
'
mm/mediawiki-file-attachments'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Me
r
ge
b
ranch 'tr/main
t
-sho
w
-
w
a
lk'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Ham
a
n
o
Merg
e
branch
'
mz/rebase-no-mbox'
commit
|
commitdiff
|
tree
2012-07-13
J
e
f
f King
revisio
n
: avoid wor
k
after
--max-count is reached
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
t
1512: match the "
o
ther" object
names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
G
a
ry
G
i
b
b
ons
git
p4:
add supp
o
rt for
'p4 move' i
n
P4Submit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Hamano
t7003: add test
t
o
filter
a
branch wit
h
a commit at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Ju
n
io C Hamano
date
.
c
:
F
ix
off by
o
ne
e
rror in
o
bjec
t
-
header date
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Jens Lehmann
s
u
b
modules: don't stumble ov
e
r symb
o
lic li
n
ks when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io C Hamano
t1512: ignore
w
hitespaces in wc -l
o
utput
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Alexander St
r
as
s
er
t4012: Unquote git
c
omman
d
fra
g
ment in test title
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Alexander Strasser
t40
1
2:
moder
n
i
ze style for q
u
o
t
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
unio C H
a
ma
n
o
R
e
duce draft release notes t
o
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Sync with
1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Git 1
.
7
.
1
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
Merg
e
branc
h
'jc/ma
i
nt-blame-
u
nique-a
b
brev' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Merge branch 'rj/plat
f
o
r
m-pread
-
ma
y
-
b
e
-
t
hre
a
d-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Merge branch 'th/d
i
ff-no-index-fixes' into
m
a
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
Merge br
a
nch '
n
d/clone-single-fix' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
i
o
C
Hama
n
o
M
erge br
a
nch 'jc
/
rev-l
i
s
t
-
sim
p
l
i
f
y
-
merges-first
-
parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Ha
m
a
n
o
M
e
rge
branch 'hv/su
b
module
-
u
p
dat
e
-nu
k
e-
s
u
bmodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Merge branch 'jk/diff-no-index-page
r
' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'mm/verify-fil
e
name-fix' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Ha
m
ano
Merge branc
h
'cn/cherry
-
pick-range-do
c
s' into maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Ham
a
no
Merge br
a
nch 'j
c
/
u
star-checksum-is-unsigned' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Ham
a
no
Mer
g
e
b
r
a
nch '
j
c/bu
n
dle
-
c
om
p
lete
-
not
i
ce' into main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Haman
o
Merge
b
ranch 'jc/ls-files-i-dir' into maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Me
r
ge branch
'
jc/request-pull-matc
h
-tagname
'
i
n
to
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Thomas Gummere
r
Strip namelen out of
ce_flag
s
into
a
c
e_namelen field
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
e
rge branch 't
g
/maint-cache-name-comp
a
r
e
' i
n
t
o
tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
cache_
n
ame_compare(): d
o
n
o
t truncate
w
h
ile comparing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Jeff
King
inde
x
-pack: lo
o
p while inflating
objects
i
n
unpack_data
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
J
e
ff Ki
n
g
commi
t
:
fix "--ame
n
d --on
l
y" with no p
a
t
h
spec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
appl
y
: tests for the --
3
wa
y
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Jeff
K
ing
a
d
d
:
creat
e
ADD_EDIT
.
patch wit
h
m
ode 0666
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
J
un
i
o C Hamano
filter-branch: do not fo
r
ge
t
the
'@' prefix to force
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
r
e
v-
p
a
rse -
-
disambiguate=
<
pref
i
x
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hama
n
o
r
e
v-parse:
A and B i
n
"rev-parse A
.
.
B
"
refer t
o
commit
t
ish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
Hamano
reset:
t
he
command ta
k
es co
m
m
ittish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ha
m
ano
c
o
mmit-tree:
the command wants a tree and commits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly: --build-fake-a
n
c
e
s
tor
e
xpects
blobs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c: add support for disambigu
a
ting other types
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
re
v
ision
.
c: the "lo
g
" family, except for "show", takes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Haman
o
rev
i
sion
.
c: allow handle_revision_
a
r
g
()
t
o take other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o
C
H
amano
sha1_name
.
c: i
n
troduce g
e
t
_
sha1_committi
s
h()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
sha1_
n
ame
.
c
:
t
each lo
o
kup context
t
o
get_sh
a
1_wit
h
_cont
e
xt()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
s
h
a1_name
.
c: m
a
ny short
names can on
l
y
b
e co
m
mitt
i
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
sha1_name
.
c
:
get
_
sha1_1(
)
take
s
lookup fla
g
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_na
m
e
.
c: get_desc
r
ibe_name() by definition g
r
ok
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
rerere:
m
ak
e
r
r-cache fanout directory
h
onor um
a
sk
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply: document --3way
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
app
l
y: allow rerere() to work
on --3way results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
a
p
p
ly: register
conflic
t
ed stages to th
e
index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C Ham
a
no
apply: --3way wit
h
a
dd/ad
d
conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
: mo
v
e v
e
r
i
f
y_i
n
dex_match() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
a
no
apply
:
plug
the three-way me
r
ge
logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
fall back on three-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ham
a
n
o
apply: accept -3/--
3
way command
l
i
ne o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
apply
:
move "alr
e
a
dy exist
s
"
l
ogic to 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
(
) closer to its
s
ole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hama
n
o
apply: further s
p
lit
load_pre
i
m
age()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
apply:
r
e
f
actor
"
p
revio
u
s patch
"
l
o
gic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply:
split load_preimage
(
) h
e
lper
func
t
ion out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: factor ou
t
c
heckout_targ
e
t()
h
e
l
per fun
c
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
a
p
ply: re
f
a
c
t
or read_
f
i
l
e_
o
r_git
l
i
nk()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: clear_i
m
a
g
e() clears th
i
ng
s
a
bi
t
more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
mano
appl
y
: a bi
t
more comme
n
ts o
n
PATH_TO_BE_DELETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Ham
a
no
apply: fix an incomplete comment in check_pat
c
h()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ale
x
R
ies
e
n
Restore umasks influe
n
ce on
the pe
r
missio
n
s of work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next