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
J
u
n
io C Hamano
Merge b
r
anc
h
'jc/app
l
y-3way'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io
C
H
a
ma
n
o
Merge branch
'cw/rebase-i-root'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o
C
Hama
n
o
Merge
branc
h
'pw/git-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Junio
C H
a
ma
n
o
Merge bra
n
c
h
'pw/git-p
4
-j
o
bs'
commit
|
commitdiff
|
tree
2012-07-14
Junio
C
Hamano
Merg
e
br
a
nch 'jk/pus
h
-delete-re
f
-error-message'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C Hamano
Sixth bat
c
h for
1
.
7
.
1
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
ano
Mer
g
e b
r
anch 'jc/r
e
f
a
c
t
or-diff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
amano
Merge branch 'tg/ce-n
a
melen'
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
mano
Merge branch
'tb/sanitize-decomposed-
u
tf-8-path
n
ame'
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
m
a
no
Merge branch
'
m
m/mediaw
i
ki-tests'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C
H
amano
Mer
g
e
bra
n
c
h '
j
n/vcs-s
v
n'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Ha
m
ano
Me
r
g
e
branch 'mm/me
d
i
a
wiki-file-attachments'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C Ham
a
n
o
Merge br
a
n
ch 'tr/
m
aint-show-walk'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
ano
Merge branch '
m
z/rebas
e
-no-mbox
'
commit
|
commitdiff
|
tree
2012-07-12
Gary G
i
bbo
n
s
g
i
t
p4: add support for '
p
4 m
o
ve' in P4S
u
bmit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
R
e
duce
draft
release notes to 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
J
uni
o
C Hamano
Sync with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Ham
a
no
G
i
t 1
.
7
.
11
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jc/maint-blame-unique
-
abbrev' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
M
e
rge branch 'rj/platform-pread
-
m
a
y-b
e
-thr
e
ad-
u
ns
a
fe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
Me
r
ge bran
c
h 'th/diff-no-index-fixes' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio
C Hama
n
o
Merge
b
r
a
nch 'nd/clone-single-fi
x
' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'j
c
/
re
v
-list-si
m
p
lif
y
-
merges-fir
s
t-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
erge
branch 'hv/
s
ubmodule-
u
pda
t
e-n
u
ke-su
b
modu
l
es'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
unio C
Ha
m
ano
Merg
e
branch 'j
k
/di
f
f-n
o
-index-pager
'
into main
t
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
M
erg
e
branch 'mm
/
v
e
rify-filename-fi
x
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge br
a
nch 'c
n
/cherry-p
i
ck-r
a
nge-
d
ocs' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Ha
m
an
o
Merge branch 'jc/ustar-checksum-i
s
-unsigned' in
t
o m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
e
rge b
r
anc
h
'jc/bundle-complete-notice' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge branch 'jc/
l
s-f
i
l
es
-
i
-
dir' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
ni
o
C Ham
a
no
Merge branch 'j
c
/request
-
pul
l
-ma
t
ch
-
tagname' into m
a
i
n
t
commit
|
commitdiff
|
tree
2012-07-10
Junio C
H
amano
appl
y
:
t
est
s
for the --3wa
y
optio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o C Hamano
a
p
pl
y
:
do
c
ument --3
w
ay op
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
an
o
apply:
a
llow re
r
ere() to work on --3way results
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
reg
i
s
t
er conflicted sta
g
es
to
the i
n
dex
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
apply: --3way wi
t
h add/a
d
d confli
c
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: move v
e
rify_index_ma
t
c
h
(
)
higher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply:
plug t
h
e thre
e
-way m
e
rge
logic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
a
pply: fall
b
ack on t
h
ree-
w
ay me
r
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Haman
o
apply: accept -
3
/--3way command
line o
p
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: move "already exists" logic
to che
c
k
_t
o
_c
r
eat
e
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C H
a
man
o
apply: move chec
k
_to_cre
a
te_blob() closer to its sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply: further
split
load_preimage()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C H
a
mano
apply:
r
efacto
r
"previous patch" logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hamano
a
pply:
split load_
p
reimage()
helper fun
c
tio
n
out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
amano
apply: factor out checkout_targ
e
t()
h
elper funct
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
a
p
ply: refactor re
a
d_file_or_gitlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply
:
c
lear
_
image(
)
clears things a
bit more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
a
mano
a
p
ply: a bit m
o
re c
o
mments
o
n PATH_TO
_
BE_DEL
E
TED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
amano
app
l
y: fix an incom
p
l
ete comment
i
n check
_
patch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
amano
M
e
rge
g
it://
g
ithub
.
c
om/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Fifth b
a
tch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ha
m
ano
Merge branch '
c
w/he
l
p-over-network'
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C H
a
mano
M
e
rge
b
r
an
c
h '
m
z/em
p
t
y-reb
a
se-test'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
Merge branch '
p
w/gi
t
-p4-te
s
ts'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C H
a
mano
Merge branch 'js/fast-expo
r
t
-
p
aths-with-spac
e
s'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
e
rge b
r
a
n
ch 'cw/no-detaching-
a
n-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Merge branch 'vr/use-our-perl-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C
Ha
m
ano
Merge branc
h
'mm/c
r
e
d
entia
l
-plumbing'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C Haman
o
M
erge b
r
anch 'jc/maint
-
blame-u
n
ique-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Me
r
ge branch 'jn/perl-makema
k
er-lead
i
ng-pat
h
s'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C H
a
mano
Merge branch 'rj
/
platform-pread-may-be
-
thread-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Merge branch
'
mm
/
config-xdg'
commit
|
commitdiff
|
tree
2012-07-09
To
r
s
ten
B
ögershausen
git on
M
ac
OS and precompos
e
d 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 Gummerer
Replace
s
trlen() wit
h
c
e
_namel
e
n(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
M
atthieu Moy
git-remote-
m
ediawiki
:
up
d
a
te comments to reflect credential
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthi
e
u
Moy
git-remo
t
e-me
d
i
awiki:
be
m
o
r
e defensive
w
hen re
q
uests
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-remote-m
e
di
a
wiki:
m
o
r
e
efficient 'pu
l
l' in the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthie
u
M
o
y
git
-
remote-med
i
awiki: extract
r
evision-importing
l
oop
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu
Mo
y
git-remote-med
i
a
w
i
ki:
r
efa
c
to
r
loop over revisio
n
ids
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
g
it-
r
e
m
ote-m
e
diawiki: cha
n
g
e
return t
y
p
e
of get
_
mw_p
a
ges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
NG
U
YEN
K
im Thu
a
t
git-remote-mediawiki (t
9
3
63): t
e
st 'File:' import and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
M
atthieu Moy
g
i
t
-remo
t
e-mediawiki: su
p
port fo
r
uploadin
g
file i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
S
i
mon Catheb
r
as
git-remote-mediawiki
(
t9362): test git-rem
o
te-mediawiki
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Guill
a
ume
S
a
sdy
git-remote-mediawiki (t9361): test gi
t
-
r
emote-mediawiki
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Gu
i
llaume Sasdy
g
it-remote-mediawiki (
t
9360): te
s
t git-remot
e
-mediawiki
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume
S
asdy
g
i
t-
r
em
o
te-mediawiki: test enviro
n
ment of git-r
e
m
o
t
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume Sasdy
g
i
t-remote-me
d
iaw
i
k
i: s
c
ripts t
o
install, d
e
lete
a
nd
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Gary Gibbons
git p
4
: refacto
r
diffOp
t
s
calculation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Pete Wyckoff
git
p4: notice Jo
b
s
lines in git comm
i
t
m
e
ssag
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Pete
Wyckoff
git
p4 test: refactor marshal_dump
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Pe
t
e Wyckoff
git p4: remove
unus
e
d
P
4
Submit int
e
ractive sett
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Michae
l
J
Gruber
t
3
404:
m
ake t
e
st 57 wo
r
k with dash
and oth
e
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Matthieu Moy
git-rem
o
te-mediawiki: impro
v
e support fo
r
non
-
English
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Fourth bat
c
h for 1
.
7
.
1
2
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/c
l
one-si
n
gle-fix
'
commit
|
commitdiff
|
tree
2012-07-05
Junio C H
a
man
o
Me
r
ge branch 'th/diff-no-index-fixes'
commit
|
commitdiff
|
tree
2012-07-05
Junio C H
a
mano
M
e
rge branc
h
'hv/remote
-
end-hung-up'
commit
|
commitdiff
|
tree
2012-07-03
Jeff Kin
g
push: don't gues
s
at qualifying remote refs on deletion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
A
n
d
reas Schwab
Fix formatting
i
n
gi
t
-config(1)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-02
Juni
o
C
H
a
mano
S
ync
with i1
8
n-po
updates in maint
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
Merg
e
branch 'maint
'
of g
i
t://github
.
com/git-l10n/
g
it
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hama
n
o
b
l
a
m
e: compute abbreviation wi
d
t
h
t
hat
e
nsures uniqueness
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-29
J
ohannes Sixt
p
e
rl/Makef
i
le: Fix a missing doub
l
e
-
q
u
ote
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C
H
ama
n
o
diff-inde
x
.
c: "git diff
"
has no need
to
r
ead blob f
r
om
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
Ham
a
no
diff-index
.
c: uni
f
y h
a
n
dling of command line paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ha
m
ano
diff-index
.
c: do not
p
retend path
s
are paths
p
ec
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C
H
ama
n
o
T
hird
b
atch for 1
.
7
.
1
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge b
r
anch '
f
c/gi
t
-p
r
ompt-script'
commit
|
commitdiff
|
tree
2012-06-28
J
un
i
o C Hamano
Merge
branc
h
'js/submod
u
l
e
-relative'
commit
|
commitdiff
|
tree
next