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
Matt
h
ieu Moy
git-remote-
m
ediaw
i
ki: properly deal with invalid remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-16
Matthieu Moy
g
it-remote-mediawiki
:
show p
r
og
r
ess inf
o
rmation when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-16
Matthieu Moy
gi
t
-remote-mediaw
i
ki:
s
how progress information when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-16
Matthieu Moy
g
it-
r
emote-med
i
a
w
iki: use
-
-fo
r
ce when adding
n
otes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-16
Matthieu Moy
git-re
m
o
t
e-mediawiki:
g
et rid of O
(
N^2) loo
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-16
Matt
h
ieu Moy
git-remote-me
d
iawiki: ma
k
e mediafiles e
x
p
ort optional
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-16
Matt
h
i
e
u Moy
git
-
remote-me
d
i
awiki
:
actually send empty comme
n
t w
h
e
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-16
Matthieu Moy
git-re
m
ote-mediawi
k
i: don't
s
plit name
s
paces with
spac
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-16
Matthieu
Moy
config: fix
s
ev
e
ral acces
s
(NULL) calls
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-16
M
i
chael Schub
e
rt
Documentation/git-daemon: ad
d
missing word
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-16
Je
f
f King
status:
col
o
r
in-pr
o
gress messa
g
e like ot
h
er header
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C
Hamano
Update d
r
aft release no
t
es for 7th batch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-16
Junio C
Hamano
Merge br
a
nch '
t
g/maint-cache-name-
c
ompar
e
'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C H
a
m
ano
M
erge branch 'jk/index-pack-streami
n
g-fix'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
i
o C Hamano
Merge bra
n
ch 'jk/m
a
int-commit-amend-only-
n
o-paths'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o C H
a
ma
n
o
M
e
rge
branch 'c
w
/amend
-
c
o
mmit-w
i
thou
t
-
m
es
s
age'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
M
erge branch 'jn
/
makefile-cle
a
nup'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch
'
ar/clone-honor-um
a
sk-at-
t
op'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch 'jc/
a
pply-3way'
commit
|
commitdiff
|
tree
2012-07-16
J
u
n
io C Hamano
Merge bran
c
h 'c
w
/re
b
ase-i-root'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch 'pw
/
g
i
t-
p
4-move
'
commit
|
commitdiff
|
tree
2012-07-15
Štěpán
Němec
d
oc
:
A
f
e
w
minor copy
edits
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
Merge branch 'p
w
/
git-p
4
-jobs'
commit
|
commitdiff
|
tree
2012-07-14
J
u
nio
C
Hamano
Merge branch 'jk/push
-
dele
t
e-ref-
e
rror-message'
commit
|
commitdiff
|
tree
2012-07-13
Paul G
o
rtma
k
er
a
m: indicate where a
f
ailed patch is to be
f
ound
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Ham
a
no
Sixth batch for 1
.
7
.
1
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branch 'jc/ref
a
ctor-diff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Mer
g
e branch 'tg
/
c
e-namel
e
n'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C Hamano
Merge bran
c
h
'tb/sanitize-decomposed-utf-8
-
pat
h
name'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
Merge br
a
nch 'm
m
/med
i
awi
k
i-tests'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Me
r
g
e
br
a
nch
'
jn/vcs-s
v
n'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C
H
ama
n
o
Merge bra
n
ch 'm
m
/mediawi
k
i-file-att
a
ch
m
ents
'
commit
|
commitdiff
|
tree
2012-07-13
J
u
n
i
o
C
H
a
man
o
Mer
g
e branch 'tr/maint
-
show-walk
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Me
r
ge branch
'mz/rebase-no-mb
o
x'
commit
|
commitdiff
|
tree
2012-07-13
Jeff
K
in
g
revision: av
o
id
w
o
rk af
t
e
r
-
-max-count i
s
r
each
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
amano
t1512: ma
t
c
h t
h
e "othe
r
" objec
t
names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Gar
y
Gibbons
git p4: add su
p
port for 'p4 move'
i
n
P
4
S
u
bmit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Ju
n
i
o C Ha
m
ano
t7003: add test to filter a branch with a com
m
it
at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
J
u
nio C Hamano
d
at
e
.
c:
F
i
x o
f
f
by on
e
error in ob
j
ect
-
hea
d
er
d
ate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Jens Le
h
mann
submodules: don't stumble over symbolic
l
i
n
k
s w
h
en
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
Ha
m
ano
t
1512: ignore whitesp
a
c
e
s
in wc -l output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Alexander Strasser
t
4
012: Unquote gi
t
com
m
and fra
g
ment in te
s
t title
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Alexander St
r
as
s
er
t4012: moder
n
iz
e
style for q
u
oting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Reduce draft release notes 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
n
io
C
Hamano
G
i
t 1
.
7
.
11
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Merge branch 'jc/main
t
-bla
m
e-unique-abbrev' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
M
erge branc
h
'
r
j/platform-pread-may-
b
e-th
r
ead-u
n
safe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'th/diff-no-i
n
de
x
-fixes' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
erge
b
ranch
'
n
d
/
c
lon
e
-sing
l
e-fix'
i
nto
m
aint
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io C Hamano
Me
r
g
e branc
h
'j
c
/
r
ev-lis
t
-simp
l
ify-
m
erges-first-pa
r
ent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Me
r
g
e
branch
'hv/submodul
e
-update-nuke-su
b
modules
'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io C Hamano
Merge bra
n
ch '
j
k
/diff-no-index
-
pager' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge branch 'mm/verify-fil
e
na
m
e-
f
i
x
'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Mer
g
e
branc
h
'cn/cherry-pick-range-docs' into maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
Merge branch '
j
c/us
t
ar-checksum-is-unsigned' int
o
maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio
C
Haman
o
Mer
g
e br
a
n
c
h 'jc/bu
n
dle-comp
l
ete-notice'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C H
a
mano
Merge
branch 'jc/ls-files-i-di
r
' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io C Hamano
Merge
branch '
j
c/reques
t
-pull-match-tagname' i
n
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Thom
a
s G
u
mmerer
Strip namelen
o
ut of ce
_
flags
i
nto a ce_name
l
en field
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge branch 'tg/maint-cache-
n
a
m
e-c
o
mpare' into
tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
uni
o
C Hamano
c
ache_name_com
p
a
r
e(): do n
o
t t
r
uncate while comparing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Jeff King
inde
x
-p
a
ck: loop whi
l
e inflating objects in unpack_data
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Jeff
K
ing
commit: fix "--a
m
end -
-
on
l
y" wi
t
h no p
a
thspec
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Ju
n
io C Hama
n
o
apply: tests for
t
he --3way optio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Jeff King
add: create ADD_EDIT
.
patch w
i
th m
o
de
0666
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Junio
C Ham
a
no
filter-branch: do not forge
t
the
'@' pre
f
ix to
f
orc
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
H
amano
rev-parse --disambiguate
=
<prefix>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Hamano
r
ev-parse: A an
d
B in "rev-pa
r
se A
.
.
B" re
f
er to committish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
r
e
set: the co
m
m
and takes committish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hamano
commit-t
r
ee: the comm
a
nd wants a t
r
ee an
d
com
m
its
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply:
-
-build
-
fake-ancestor exp
e
cts
bl
o
bs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
am
a
no
sh
a
1_name
.
c:
add suppor
t
for
d
isam
b
iguating othe
r
t
y
pes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
revision
.
c
:
the
"
lo
g
" family, except
f
or "show", takes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
revisio
n
.
c: all
o
w ha
n
d
l
e_revision_arg(
)
to take ot
h
er
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ha
m
ano
sha1_name
.
c: introduce
get_sha1_co
m
mittish()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
sha1_name
.
c: t
e
ach lookup co
n
text to
g
et_sh
a
1_with_context
(
)
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: many short n
a
m
e
s c
a
n only be
c
ommittish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
s
h
a1_
n
ame
.
c:
get_sha1_1() takes lookup
f
lags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
sha1
_
name
.
c: get_descri
b
e
_name() by definition
g
roks
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o C Ham
a
no
r
ere
r
e: make rr-cache
f
anout
directory honor
u
mask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
ap
p
ly:
d
ocument
--3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: allow rerere(
)
to
w
or
k
on -
-
3w
a
y
r
esults
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply:
r
egi
s
ter conflict
e
d
stages to the index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C H
a
mano
a
p
ply: --3way with add/ad
d
conflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Hamano
apply: move v
e
rify_index_mat
c
h() higher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
H
a
mano
apply: plug the three-wa
y
merge log
i
c in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C H
a
mano
a
p
p
ly: fall bac
k
o
n
three-way merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: accept -
3
/--
3
wa
y
comman
d
l
i
ne option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
apply: move "already exists"
l
ogic to check_to_crea
t
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
apply
:
move
c
heck
_
to_cr
e
ate_bl
o
b() c
l
oser to
i
t
s sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
an
o
a
pply: further
s
pli
t
load_preimage(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply:
re
f
a
ctor "previ
o
us patch" logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: spli
t
load_preimage() helper function out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply: fa
c
tor
out
checkout_target()
h
elpe
r
function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
a
pply: refa
c
tor read_file
_
o
r
_gitlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Ha
m
ano
app
l
y: clear_image(
)
clears th
i
ngs a bit more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
a bit more
comments on PATH_TO_BE_DEL
E
T
E
D
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply: fix an
i
nc
o
mplete comme
n
t in check_patch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
A
le
x
Riesen
Restore
umasks
in
f
lue
n
c
e
on the per
m
issions of
w
ork
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next