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 'jc/apply-3way'
2012-07-16
Juni
o
C H
a
m
a
no
Merge branch 'jc/apply-3way'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge br
a
n
c
h 'cw/rebas
e
-i-root'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ha
m
a
no
Merge
b
ranch '
p
w/
g
it-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
J
u
ni
o
C Hamano
Merge bran
c
h
'pw/git-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C
Hamano
Mer
g
e
branch
'
jk/
p
ush-d
e
lete-ref
-
error-message'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Hamano
Sixth batch f
o
r 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Ha
m
ano
M
erge branch 'jc/r
e
f
a
c
t
or-diff-
s
tdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
mano
Merge
bra
n
ch 'tg/ce-namele
n
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge b
r
a
n
c
h 'tb/sa
n
i
t
ize-decomposed-utf-8-pathname'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Ha
m
ano
M
erge branch 'mm/mediawiki-test
s
'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Ha
m
ano
Merge
b
ranch 'j
n
/vcs-svn'
commit
|
commitdiff
|
tree
2012-07-13
J
u
ni
o
C Hamano
Merge bra
n
ch
'
mm/mediawiki-f
i
le-at
t
a
chments'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C Hama
n
o
Mer
g
e
b
r
a
nch 't
r
/m
a
int
-
show-walk
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hama
n
o
Merge branch 'mz/re
b
ase-no-mb
o
x'
commit
|
commitdiff
|
tree
2012-07-12
Gary Gibbons
g
it p4: add
support
for
'
p
4
move' in
P
4Submit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Reduc
e
draft
r
e
l
ease notes to
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Syn
c
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 Hama
n
o
Merge branch 'jc/maint-b
l
am
e
-uniqu
e
-abbrev' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
Merge b
r
an
c
h
'rj/platform-pr
e
a
d-may-be-threa
d
-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Mer
g
e
b
ranch 'th/dif
f
-no-index-
f
ixes' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
e
rge
branch 'nd/clone-sin
g
l
e
-fix' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Merge
branch 'jc/rev-list-simplif
y
-merges-first-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
unio C
Ha
m
ano
M
erge branc
h
'hv/submodule
-
update-nuke-submodul
e
s'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Me
r
ge branch
'
j
k
/diff-no-index-pager' into maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Ha
m
ano
Merge branc
h
'mm/verify
-
filena
m
e-fix'
into maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Merge bran
c
h 'cn/cherry-p
i
ck-r
a
nge
-
d
ocs' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
a
n
o
Merge branch 'jc/ustar-check
s
um-is-unsig
n
ed' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
Merge branc
h
'jc/bundle-c
o
m
p
l
e
te-notice' i
n
t
o
maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio
C Ha
m
an
o
M
erge branch 'jc/ls-files-i-dir' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch
'
j
c
/reque
s
t-pull
-
match-tagnam
e
' into maint
commit
|
commitdiff
|
tree
2012-07-10
Junio
C
H
a
ma
n
o
a
p
ply: tests for the -
-
3wa
y
op
t
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
H
amano
apply
:
docume
n
t --3way opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply:
a
llow rerere() to work on --3way results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: regi
s
ter conflicted stages t
o
the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply: --3way with ad
d
/add c
o
nflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Hamano
apply: move verify_index_match() highe
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Haman
o
apply: plug the thre
e
-way merge logic
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C H
a
m
a
n
o
a
pply: fall back on th
r
ee-w
a
y merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply:
accept
-
3/--3wa
y
command line
o
p
t
io
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
apply: move
"
already exists" logic
t
o
check_to_cre
a
te()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Hamano
a
p
ply: move chec
k
_to_creat
e
_bl
o
b() closer
to
its
sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply:
further split loa
d
_preimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: refactor "p
r
evious p
a
tc
h
" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
apply: split load_
p
reimage()
helper funct
i
on
o
ut
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Hamano
app
l
y:
f
a
c
t
or
o
u
t check
o
u
t
_
t
arget() helper functio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: refactor read_fil
e
_or_gitlin
k
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
: clear_image() clear
s
things a bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply: a bit more
comme
n
ts 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 Hamano
ap
p
ly:
f
i
x an
i
ncomplete comment in c
h
eck_p
a
tch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hama
n
o
Merge git:/
/
gith
u
b
.
com/g
i
t-l10n/
g
it-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
Fif
t
h batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Me
r
ge bra
n
ch 'cw/he
l
p-over-
n
e
twor
k
'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
H
ama
n
o
Merge bran
c
h 'mz
/
empty-reba
s
e-test'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ha
m
ano
Merge branch 'pw/git-p4
-
tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
M
erge branch
'
js
/
fast-export-paths
-
with-spa
c
es
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'cw/no-
d
etaching-an-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge br
a
nch
'
vr/use-our
-
perl-in-te
s
ts'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Merge branc
h
'm
m
/credential-p
l
umbing'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge br
a
nch 'j
c
/ma
i
nt-b
l
ame-unique-a
b
brev'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Me
r
ge branch
'
jn/p
e
rl-makemaker-leading
-
path
s
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
Mer
g
e b
r
anch 'r
j
/platform-pread-m
a
y-b
e
-thread-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
M
erge br
a
nch 'm
m
/config-xdg'
commit
|
commitdiff
|
tree
2012-07-09
To
r
s
t
en Böger
s
hausen
git
on Mac OS and precomposed unicode
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Thomas Gumme
r
er
R
e
place str
l
en() with ce_na
m
ele
n
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Matthieu Moy
git
-
r
emo
t
e
-med
i
awiki: update co
m
m
ents to refl
e
ct credential
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git
-
remote-media
w
iki:
b
e more d
e
fensive when requests
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
M
a
tthieu
M
oy
g
i
t-
r
emote-mediawiki: more effi
c
ient
'
p
ull' i
n
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthie
u
M
o
y
g
i
t
-remote-mediaw
i
ki: extract
revision-impor
t
ing loop
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-r
e
mote-
m
e
d
i
a
wiki: refactor loo
p
over rev
i
sio
n
ids
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-remote-med
i
aw
i
ki: change return type
o
f get
_
mw_page
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
NGUYEN Kim
Th
u
at
git
-
remote-mediawiki (t9363
)
: test
'
F
i
le:' im
p
o
r
t
a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-remot
e
-mediawiki: sup
p
ort for uploading
file in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Si
m
on Cathebras
gi
t
-remote-me
d
iawiki
(
t9362): te
s
t git-remote-me
d
i
awiki
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Guillaum
e
S
asdy
git-remote-media
w
iki (t9361): te
s
t
g
it-remote-mediawiki
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume Sasd
y
g
i
t
-
remote-mediawiki (t936
0
): test git-re
m
ote-mediawiki
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Guil
l
aume Sasdy
git-remote-mediawiki
:
t
e
st environment of git-re
m
o
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Guill
a
ume Sasd
y
git-remote-m
e
diawi
k
i: scripts to inst
a
l
l, delete and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Gary Gibb
o
ns
g
it p4: refactor diffOpts calcula
t
io
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
P
et
e
Wyc
k
off
git p4: no
t
ice J
o
bs lines in git
c
om
m
it messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Pete
Wyckof
f
git p4
test:
r
efactor mar
s
hal_dump
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Pe
t
e
Wy
c
koff
git p4:
remove
u
nused P4Submit
interactive setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Mich
a
el J Grube
r
t340
4
: make test 57 work
w
ith dash and others
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Matth
i
e
u M
o
y
git-remote-mediawik
i
: imp
r
ove suppor
t
for
n
on-English
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
J
u
n
i
o C
Haman
o
Fourth
batch for
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Junio C
Ha
m
a
n
o
Merge branch 'nd/clone-single-fix'
commit
|
commitdiff
|
tree
2012-07-05
J
u
nio C H
a
mano
Mer
g
e b
r
anch 'th/di
f
f-
n
o-index-fix
e
s'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
M
erge
bran
c
h 'hv/remote-end-hung-up'
commit
|
commitdiff
|
tree
2012-07-03
Jeff
K
ing
push: don't guess at
qualifyin
g
remote refs on d
e
letion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Andreas Schw
a
b
Fix formatting
i
n git-config(1)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
Junio C Ha
m
ano
Sync w
i
th
i18n-
p
o upd
a
te
s
in maint
# Via
Junio C Hamano
(1) and Peter Krefting (1)
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hama
n
o
Merg
e
branch '
m
aint' of gi
t
://
g
ithub
.
co
m
/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Junio C
H
amano
blame: com
p
ute abbrevia
t
ion widt
h
that ensures uniqu
e
n
ess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-29
Johannes Six
t
perl/Makefi
l
e: F
i
x a missing double-quote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio
C Hamano
d
i
ff-in
d
ex
.
c:
"
git d
i
ff" h
a
s no need to r
e
ad
blob
from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Haman
o
diff
-
index
.
c
: unify hand
l
ing of command line
p
aths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
diff-index
.
c:
d
o no
t
preten
d
path
s
are pa
t
hspe
c
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C H
a
mano
Third batc
h
for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge bran
c
h 'fc/
g
it-p
r
ompt-script'
commit
|
commitdiff
|
tree
2012-06-28
J
unio C
Hamano
Me
r
ge branch '
j
s/subm
o
dule
-
r
elative'
commit
|
commitdiff
|
tree
next