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 branch 'jk/autoident-test'
2012-07-16
Matthieu
M
oy
git-remote-media
w
iki: show progress in
f
ormatio
n
when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Mat
t
h
ieu Moy
git-r
e
mote-media
w
i
ki: show progress infor
m
at
i
on when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Matthieu Moy
git-re
m
ote-m
e
diawiki: use --force
w
hen
a
ddin
g
no
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Matthie
u
M
o
y
git-rem
o
te-mediawiki
:
ge
t
rid
of O(N^2) lo
o
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Matthieu
Mo
y
git-remote-mediaw
i
ki: make mediafiles
e
xport optio
n
al
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Ma
t
thie
u
M
oy
git
-
remo
t
e
-
med
i
awi
k
i: actually send
emp
t
y comm
e
n
t
when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
M
at
t
hieu Moy
git-remote-
m
ediaw
i
k
i
:
don't split
namespaces
w
i
th
s
paces
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Matt
h
i
eu Moy
config: fi
x
se
v
eral acces
s
(
NULL
)
call
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
M
i
chael Schuber
t
Documentation/git
-
daemon: add
m
is
s
i
n
g word
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Jef
f
Ki
n
g
status: color in
-
progress
m
essage l
i
ke other heade
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Hamano
U
p
d
ate dr
a
ft release notes for
7
th batch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C Hamano
Merge bran
c
h 'tg/ma
i
n
t
-
cache-
n
a
m
e-compare'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Haman
o
M
e
r
g
e branch 'jk/index-pack-st
r
eam
i
ng-f
i
x'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Hamano
M
er
g
e branch 'jk/maint-commit
-
a
m
end-only
-
no-p
a
ths'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C Hamano
M
erge bran
c
h
'cw/amend-commit-with
o
ut-message'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Ham
a
no
Merge branch '
j
n
/
make
f
ile-
c
l
eanu
p
'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C
H
a
mano
Mer
g
e branch 'ar/c
l
one-ho
n
or-umask-at-t
o
p'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio
C
H
a
man
o
Merge branch 'jc/ap
p
ly-3way'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o C Hamano
M
e
rge branch 'cw/r
e
base-i-root'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge
bra
n
ch '
p
w/git-p4-move'
commit
|
commitdiff
|
tree
2012-07-15
Štěpán Němec
doc: A few minor
c
opy edits
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-14
Jun
i
o C Hama
n
o
Merge bra
n
ch 'pw/g
i
t-p4-job
s
'
commit
|
commitdiff
|
tree
2012-07-14
Junio
C
Ha
m
a
n
o
Merge
b
ranch 'jk/push-delete-ref-error-message'
commit
|
commitdiff
|
tree
2012-07-13
P
a
ul Gortmaker
am:
i
ndicate where a failed pat
c
h
is
t
o be fo
u
nd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
mano
Sixth b
a
tc
h
for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C H
a
m
ano
Merge
b
ran
c
h 'jc/refactor-diff-s
t
di
n
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
mano
Merge branch 'tg/ce-na
m
elen'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge
br
a
nch 'tb
/
san
i
ti
z
e-decompos
e
d-utf
-
8-pa
t
hname'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C Hamano
Merge
b
ranch '
m
m/mediawiki-tests'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branc
h
'
jn
/
vc
s
-
s
v
n'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
ano
Merge branch 'mm
/
mediawiki-f
i
le-att
a
ch
m
ents'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
a
mano
M
erge b
r
anch 'tr/maint-show-
w
alk'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
ano
Me
r
ge br
a
nc
h
'mz/rebase
-
no
-
mbox'
commit
|
commitdiff
|
tree
2012-07-13
Jeff King
revision: av
o
id
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
t151
2
: match th
e
"
ot
h
er" obje
c
t names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Gary
G
ib
b
ons
git p4: add support for 'p4 move'
i
n P4S
u
bmit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
J
u
nio C H
a
mano
t7003: add test to fil
t
er a br
a
nch with
a commit a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Haman
o
date
.
c: Fi
x
off by one error in obje
c
t-
h
ea
d
er dat
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Jens Lehmann
submodul
e
s
: don't s
t
u
m
ble
o
ver sym
b
ol
i
c links when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
t1512: ignore
whitesp
a
ces in
wc -l output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Alex
a
n
d
er
S
trass
e
r
t4012: Unquot
e
g
it comma
n
d f
r
a
g
men
t
in test t
i
tle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Alexander Stra
s
ser
t4012:
m
oderniz
e
s
t
yl
e
for quoting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Reduce
draft relea
s
e notes to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C Hamano
S
y
nc with
1
.
7
.
11
.
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
Junio C Ha
m
an
o
Me
r
ge branc
h
'
j
c/maint
-
bl
a
me-u
n
ique-
a
b
b
rev' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Merge branch 'rj/pla
t
f
o
rm-pre
a
d-
m
ay-
b
e-th
r
e
ad-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Mer
g
e branch 't
h
/diff-no-
i
n
dex
-
fixes' into main
t
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Haman
o
Me
r
ge branch 'nd/
c
lone-single-f
i
x' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
Merge br
a
nch 'jc/rev-l
i
st-simplify-m
e
rges-
f
irst-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Ham
a
no
Mer
g
e br
a
nch
'
hv/
s
ubm
o
dule-up
d
ate-nuke-submodu
l
es'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch '
j
k/
d
iff
-
no-index
-
pager' int
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
Merge
b
r
a
nch
'
m
m/verif
y
-filename-fix' into
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
M
e
rge
branch
'cn/che
r
ry-p
i
ck-
r
ange-docs'
i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
a
m
a
no
M
e
r
ge branch
'
j
c/ustar-checksum-i
s
-un
s
ig
n
e
d' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
Merge branch
'
j
c/bundle-complete-noti
c
e' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge bra
n
c
h 'jc/ls-files-i-d
i
r' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
Merge br
a
nch 'jc/re
q
uest-pull-match
-
tagname' in
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Thomas G
u
mmerer
Strip namelen out of ce_flags into
a
ce_n
a
me
l
en field
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
Merge br
a
nch
'tg/maint-cache-name-
c
omp
a
re' into tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
ni
o
C
Hamano
cache_name_compare
(
): do n
o
t truncate whi
l
e comparin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Jeff Ki
n
g
index-pack: loop while inflating
o
bjects in unpack
_
data
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
J
e
ff
K
i
n
g
commi
t
: fix "--amen
d
--on
l
y" with no p
a
thspe
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
J
un
i
o C
Hama
n
o
apply: tests for th
e
-
-
3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Jeff King
add:
c
r
eate
ADD_EDI
T
.
patc
h
with mode 0666
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Jun
i
o C Hamano
filt
e
r-branch: do not forg
e
t the '@
'
prefix to force
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rev-pa
r
se --disa
m
biguate=<prefix
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Ha
m
ano
rev-pars
e
:
A
a
n
d B in "rev-parse
A
.
.
B" refer to c
o
m
m
it
t
i
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
H
amano
re
s
et: the
command
t
akes
com
m
i
t
tis
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
commit-tree: the command wants a tre
e
a
nd c
o
mmits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
app
l
y: --build-fake-a
n
cestor expects blobs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
ama
n
o
sha
1
_name
.
c: add supp
o
r
t
for disam
b
i
g
uating ot
h
er types
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C H
a
ma
n
o
revisi
o
n
.
c: the "log" family, except for "show", takes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
Hamano
revision
.
c: allow h
a
ndl
e
_revis
i
o
n
_a
r
g
(
)
to take other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
sha1
_
nam
e
.
c: introduce get_sha1_committish
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Haman
o
s
h
a1_name
.
c:
te
a
c
h looku
p
context t
o
ge
t
_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_name
.
c: m
a
ny short name
s
can only be c
o
mmittis
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_
n
ame
.
c: get_sha1_1() ta
k
e
s
l
ookup f
l
a
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:
g
et_describe_name() by
d
efin
i
ti
o
n
gr
o
ks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
rerere: make r
r
-
c
a
c
he fan
o
u
t dir
e
ctor
y
honor umask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ham
a
no
a
p
ply: docum
e
n
t
--3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C Hamano
a
p
p
ly: allo
w
rerere(
)
to work o
n
--3way results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
: register conflicted s
t
ages to the i
n
dex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
apply: --
3
wa
y
with add/add conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
a
pply: move
verify
_
ind
e
x_match
(
)
h
igher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply: plug t
h
e
t
h
re
e
-
way merge 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
Junio C Hamano
apply:
a
c
cept
-3
/
--3way comm
a
n
d line option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
appl
y
: move "already
e
xis
t
s" logi
c
t
o che
c
k
_
to_c
r
eate()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply: move check_to_create_blob
(
)
clo
s
er t
o
its sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply
:
further s
p
lit load_preimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Hama
n
o
apply: ref
a
ctor "pr
e
vious
p
atch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
ma
n
o
apply: split
load_p
r
eimage() h
e
lper function out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o C
H
a
m
ano
apply
:
fact
o
r out chec
k
out_target() he
l
pe
r
fun
c
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply: r
e
factor
r
ea
d
_
f
i
l
e
_or_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
apply: clear_image() clears things a bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly: a bit
m
ore
co
m
ments on PATH
_
T
O
_BE_DELETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C Hamano
a
pply: fix an incomplete co
m
ment in
c
heck_pa
t
ch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Al
e
x
R
iesen
R
e
store umasks influence on
the
pe
r
m
i
ssions of
w
ork
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Chris Webb
Allow edit o
f
e
m
pty message
w
ith commit --am
e
nd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next