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/index-pack-streaming-fix'
2012-07-16
Junio C Hamano
Merge branch 'jk
/
i
n
dex-pack-stream
i
ng-fix'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
i
o
C
Hamano
Merge
branch 'jk/maint-com
m
i
t-ame
n
d
-o
n
l
y-no-paths'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch 'c
w
/
amend
-
c
ommit-without-message'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge
bra
n
ch
'jn/makefi
l
e-cleanup'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merg
e
b
ranch
'
a
r/clone-honor-umask-at-top'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge
b
ranch
'jc/app
l
y-3way'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C Hamano
Merge branch 'cw/rebase-i
-
root
'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C Hamano
M
e
rge bra
n
ch 'pw/g
i
t-
p
4-mo
v
e
'
commit
|
commitdiff
|
tree
2012-07-14
Jun
i
o C Haman
o
Merge
branch 'pw/git-p
4
-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C H
a
ma
n
o
M
erge
b
ranch 'jk/push-d
e
lete-ref-err
o
r-message'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Si
x
th ba
t
ch
for 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
Merge branch
'jc/refact
o
r-d
i
f
f-
s
tdin'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C
Ha
m
ano
M
e
rg
e
branch 't
g
/ce-name
l
en'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Haman
o
M
e
r
ge
branch 'tb/s
a
nitize-decomp
o
sed
-
u
tf
-
8-pathname'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C
Hamano
Merge branch 'mm/
m
ediawiki-tests'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
H
a
ma
n
o
Merge branch 'jn/vcs-svn'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
amano
Merge bran
c
h 'mm/mediawiki-file-at
t
achments'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Hamano
Me
r
ge
branch '
t
r/maint-show-wal
k
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge bra
n
c
h
'm
z
/
r
eba
s
e-no-mbo
x
'
commit
|
commitdiff
|
tree
2012-07-12
Gary Gibbons
git p4: add support for 'p4 move' in P
4
Submit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Re
d
uc
e
d
r
a
f
t
r
e
lease notes to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Ham
a
no
Sync with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C
Hamano
Git 1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
unio C
Hama
n
o
Merge bran
c
h 'jc/mai
n
t-b
l
ame-unique-abbrev' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
erg
e
branch 'rj/pl
a
tf
o
rm
-
prea
d
-may-b
e
-
thread-un
s
afe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
n
o
Merge branc
h
'th/diff-no
-
i
n
dex
-
f
i
xes'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C H
a
m
ano
M
erge branch 'nd/clone-
s
ingle-fix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Merge branc
h
'jc/rev-list-s
i
mplify-merges-first-p
a
rent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
ma
n
o
Merge branch 'hv
/
submodule-update
-
nuke
-
submodule
s
'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Merge branch 'jk/
d
iff
-
no-
i
ndex-pager' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Merge branch 'm
m
/verify-f
i
l
ename
-
fix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hama
n
o
Merge bran
c
h 'c
n
/c
h
er
r
y
-
pick-range-docs' int
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
Merge branch 'jc/ust
a
r-checksum
-
is-u
n
si
g
ned' into main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
H
a
mano
Merge bran
c
h 'jc/bundle
-
complete-notice' into
m
a
i
nt
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io
C
Hamano
Merge branch 'jc/l
s
-
files-i-dir'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Merge branch '
j
c/requ
e
st-pu
l
l-matc
h
-
tagname' into maint
commit
|
commitdiff
|
tree
2012-07-10
Jeff King
ind
e
x-
p
ac
k
: loop wh
i
le
inflating obje
c
ts in unpack_data
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Jeff King
c
ommit: fi
x
"--a
m
end --onl
y
" w
i
th
no
pathsp
e
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
apply: tests for
t
he
--3way optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
J
e
ff
King
add:
create ADD_E
D
IT
.
patch wit
h
mode 0666
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rerere: make rr-
c
a
c
h
e
fanout directory
ho
n
or u
m
ask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply: document --3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
H
am
a
no
apply: all
o
w rer
e
r
e
() 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: register conflic
t
ed st
a
ge
s
to the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply: --3way with
a
d
d
/add
conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
a
p
p
l
y: move verif
y
_
index
_
match() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Hama
n
o
a
pply: plug the three-way merg
e
logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Haman
o
apply: fall
ba
c
k on
t
hree-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
ap
p
ly: acce
p
t -3/--3
w
a
y
command line o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o C Hama
n
o
apply: move "already exists" logic to check_to
_
creat
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
: move che
c
k_t
o
_create_blob() cl
o
ser to its sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Hamano
app
l
y: f
u
rther
spl
i
t loa
d
_preimage
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hama
n
o
ap
p
ly: refactor "previous pa
t
ch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
a
p
ply:
split load
_
preimage() hel
p
e
r function out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: factor out che
c
kout_target() helper fun
c
t
io
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: refact
o
r read_
f
ile_or_
g
it
l
i
n
k
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
apply: clear_
i
mage()
clears
thi
n
gs
a bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ham
a
n
o
apply: a bit m
o
re comments on PATH_TO_BE
_
D
ELETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
apply: fix
an incomplete comment in check_patch(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
A
l
e
x
Ries
e
n
Restore
u
m
asks in
f
l
u
ence on the permissions of w
o
rk
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ch
r
is Webb
Allow e
d
i
t
of empty message wit
h
commit
-
-amend
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge
git://github
.
com/
g
it-l10n/git-p
o
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
Fifth batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
Merge branch
'
c
w
/help-over
-
network'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Mer
g
e branc
h
'mz/empty-rebase-te
s
t'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
M
e
rge
branch 'pw/git
-
p4-tests
'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C H
a
man
o
Merg
e
branch 'js/fast-export-p
a
ths-with-spaces'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
Merg
e
branch
'
cw/no
-
detac
h
ing-an-un
b
orn'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Ha
m
ano
Merg
e
b
ranch 'vr/use-our-perl-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
a
no
M
e
rge bra
n
ch 'm
m
/credential-plumbing
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
ano
Merge bra
n
ch 'jc/maint-blame-unique-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge
b
r
anch 'jn/perl-ma
k
e
m
a
k
er-lead
i
ng-p
a
ths'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'r
j
/pl
a
t
f
or
m
-pread-may-be-thread-un
s
afe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
M
erge branch 'mm/config-xdg'
commit
|
commitdiff
|
tree
2012-07-09
Jo
n
a
than Ni
e
de
r
M
akefile: document groun
d
rules for target-specifi
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
e
ff King
Mak
e
file
:
move GIT-VERSION-FILE
d
ependencies closer
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
M
a
kefile: build ins
t
aweb similar t
o
other scrip
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Je
f
f K
i
ng
Makefile: update sc
r
ipt
s
when bu
i
ld-
t
ime p
a
r
a
m
et
e
rs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jef
f
Kin
g
M
a
kefile
:
do no
t
replace @@
G
IT_V
E
RSION@@ in shell scr
i
pts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
e
f
f King
Ma
k
efile: s
p
lit p
r
efix
flags f
r
om GIT-
C
FLAGS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jonat
h
a
n Nie
d
er
Makefile: be
s
ile
n
t when
onl
y
G
I
T_USER_AGENT c
h
anges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
e
ff King
Makef
i
l
e:
s
plit GIT_USER_AGENT from
GIT-C
F
LAG
S
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefile:
do not replace
@
@GIT_USER_
A
GENT@@ in s
c
ripts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefile: apply d
e
p
en
d
e
n
cies consisten
t
ly
t
o sparse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jef
f
King
M
a
k
efile:
do not have git
.
o depend
o
n com
m
on-cmds
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jon
a
than Nieder
Makefi
l
e: fold XDIFF_H
a
nd VCSSVN_H
into
LIB_H
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Torsten Bögershausen
git on Mac OS and precom
p
os
e
d un
i
c
ode
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Thoma
s
Gummerer
Replace strl
e
n() with ce_namelen()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
M
a
t
t
h
i
e
u Moy
git-remote-
m
ediawiki: update c
o
mments to refl
e
ct cre
d
ential
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-rem
o
te-media
w
iki: be more defens
i
ve w
h
en requests
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-remote-mediawiki: more efficien
t
'pull
'
in th
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Ma
t
thieu M
o
y
git-remote-mediawiki: ex
t
ract revision-impor
t
ing loop
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
g
i
t-remote-mediawiki: refactor
loop
o
ver r
e
v
i
s
ion
ids
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
M
atthieu M
o
y
git-
r
emot
e
-mediawiki: c
h
ange
return typ
e
of get_mw_pages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
NGUYE
N
Kim Thua
t
git-r
e
mote-media
w
i
k
i (t93
6
3):
t
est 'F
i
l
e
:' impo
r
t and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Mat
t
hieu Moy
gi
t
-
remot
e
-mediawiki:
s
uppor
t
f
o
r upl
o
ading file in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
S
imon Cathebr
a
s
git
-
remote-mediaw
i
k
i
(t9362): t
e
st git-remote-
m
ediawik
i
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume Sas
d
y
gi
t
-remot
e
-mediawiki (t93
6
1): test gi
t
-re
m
ote-medi
a
wiki
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Gu
i
lla
u
m
e
Sas
d
y
g
it-rem
o
te-mediawi
k
i
(t9360
)
: t
e
st git
-
remote-medi
a
wiki
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Guillaum
e
Sasdy
git-remote-mediawiki:
t
est environment o
f
g
i
t-re
m
ote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next