repo.or.cz
/
git
/
mingw.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
Junio C H
a
mano
M
e
rge br
a
n
ch 'jc/apply
-
3way'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o C Ha
m
ano
Merge br
a
nch 'cw/rebase-i-root'
commit
|
commitdiff
|
tree
2012-07-16
J
un
i
o C
H
amano
Merge bran
c
h
'p
w
/git-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
Merge br
a
n
c
h
'pw/git-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
J
unio
C Ham
a
no
Merge branch 'jk/push-de
l
ete-r
e
f-error-message'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hama
n
o
S
ixth batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Hamano
Merge b
r
anch
'j
c
/refactor-diff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
Mer
g
e branc
h
'tg/ce-namelen'
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
mano
M
e
rge branch 'tb/san
i
tize-decomp
o
sed
-
utf-8-pa
t
hna
m
e'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Haman
o
M
e
rge branch
'
mm/medi
a
wiki-tests'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C
Hamano
Merge branch 'jn/vcs
-
s
v
n'
commit
|
commitdiff
|
tree
2012-07-13
J
uni
o
C Ha
m
ano
Merge branch 'mm/mediawiki
-
file-a
t
ta
c
hments'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hama
n
o
Mer
g
e br
a
nch '
t
r/maint-show-wa
l
k'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Haman
o
Mer
g
e branch
'mz/rebase-no
-
mbox'
commit
|
commitdiff
|
tree
2012-07-12
Gary Gibbo
n
s
git p
4
:
a
dd support
f
or 'p4 move
'
i
n
P4Sub
m
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Reduce
dr
a
f
t
releas
e
notes to 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Sync
w
i
th
1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Gi
t
1
.
7
.
11
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
M
erge branch 'jc/m
a
in
t
-
b
lame-uniq
u
e-abbrev
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio
C
Hamano
Merge b
r
anch
'rj/platf
o
rm-pread-may-be-thread
-
unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge
branc
h
'th/diff-no
-
index-fix
e
s' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
Merge
b
r
a
n
ch 'nd/clone-single-fix' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
n
o
Merge br
a
nch
'jc/rev-list-
s
imp
l
ify-merg
e
s
-
first
-
parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Merge branch 'hv/submodule-upda
t
e-
n
u
k
e-s
u
bmo
d
ules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Ha
m
ano
Merge branch
'
jk/diff-no-in
d
ex-pager' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge
b
ran
c
h
'
mm/verify-f
i
l
e
n
ame-f
i
x' i
n
to m
a
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
M
e
r
g
e
b
r
anch 'cn/cherr
y
-pick
-
range-docs' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
M
erge branch 'jc/u
s
tar-checksum-is
-
unsign
e
d' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branc
h
'jc/bu
n
d
l
e
-
comp
l
e
t
e-n
o
t
ice' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Merg
e
branc
h
'jc/ls-fi
l
es-i-di
r
'
in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Merge bra
n
c
h
'jc/r
e
quest-
p
ull
-
match-t
a
gna
m
e' i
n
to
m
aint
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
apply: te
s
ts for the --3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply: document --3way
o
ption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply: allow rer
e
re() to work on --3way res
u
lts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply: register con
f
lic
t
ed stages to the index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
H
amano
a
ppl
y
:
-
-3
w
ay with add/a
d
d conflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply
:
mov
e
verify_index_
m
a
t
c
h() high
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
p
l
y
: plug th
e
three-wa
y
me
r
ge logic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: fall
ba
c
k on thr
e
e
-
way
m
erge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Ham
a
no
apply: accept
-3/--3way
c
o
mmand
l
ine
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: move "al
r
ea
d
y exist
s
"
logic to check_t
o
_c
r
eate()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
m
ove check_to_
c
r
eate_
b
lo
b
()
c
loser
to it
s
sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: furth
e
r
split loa
d
_
p
reimage()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
a
n
o
apply: refact
o
r "previo
u
s
patch
"
logi
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
app
l
y: split load_preima
g
e() helper fu
n
c
tion out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
a
n
o
apply: factor out che
c
k
o
u
t_target() he
l
per functio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
app
l
y: refac
t
or read_file_or
_
gitlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o
C Hamano
app
l
y: cle
a
r_image()
c
lears
t
hings a
b
it more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: a bit more comm
e
nts
o
n PATH_T
O
_BE_DELE
T
ED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C H
a
mano
apply: fix an incomplete co
m
ment in chec
k
_
p
atch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge g
i
t:
/
/github
.
com/g
i
t-
l
10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o C Ha
m
ano
Fifth batch for
1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge br
a
nch 'cw/help
-
ov
e
r
-
network'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Haman
o
Merge
b
ranch
'mz
/
empty-
r
ebase-t
e
st'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
am
a
no
Merge br
a
nch
'pw
/
git-p4-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
aman
o
Merge
branch 'j
s
/fast-export-path
s
-
wi
t
h-spaces'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ham
a
no
Me
r
ge bra
n
ch 'cw
/
no-detaching-an-unbo
r
n'
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Ham
a
no
Merge
b
ranch 'vr/use-our-perl-in-te
s
ts'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
H
a
mano
Merge branc
h
'mm/credential-plumbing'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
Haman
o
Merge branch
'
j
c/maint-blame-unique-ab
b
rev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge bran
c
h
'
jn/perl-makemaker
-
leading-paths
'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ham
a
no
M
erge branch 'rj/pl
a
tform-pread-may-be-thread-uns
a
fe
'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
H
ama
n
o
Merge bran
c
h 'm
m
/config-xdg'
commit
|
commitdiff
|
tree
2012-07-09
Torsten Bö
g
e
rshau
s
en
git on Ma
c
OS
and prec
o
mposed unico
d
e
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
R
e
place st
r
le
n
() with c
e
_
namelen()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Matthieu Moy
git-r
e
mote
-
mediawiki
:
update
c
ommen
t
s to re
f
lect crede
n
tial
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matth
i
eu Moy
git-remote-mediawiki: be mor
e
d
e
fe
n
s
i
ve when requests
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-remote-mediawiki: more eff
i
cien
t
'p
u
ll' in the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git
-
remote
-
m
e
diawiki: extract
r
evis
i
on-importing l
o
op
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu
Moy
g
i
t-remote-media
w
iki:
refactor loop over revision ids
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu M
o
y
git-remot
e
-med
i
a
w
iki: chang
e
r
e
turn type o
f
ge
t
_mw_pages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
NGUYEN Kim
T
huat
g
i
t-
r
e
mo
t
e-mediawiki (t9363
)
: test 'File:' import
a
nd
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-re
m
o
t
e-
m
ediawiki: support f
o
r uploading f
i
le in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Simon Ca
t
hebras
git-remote-
m
ediawiki (t9362): test gi
t
-remote-m
e
diawiki
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume Sas
d
y
git-r
e
mote-media
w
i
k
i
(
t
9361): test
g
it-re
m
o
t
e-mediawiki
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
G
u
ill
a
u
me Sasd
y
g
i
t
-
remote-me
d
iawiki (t9360):
test git-remote-mediawiki
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume Sasdy
g
it-remote-m
e
d
iawiki: test enviro
n
ment of
g
i
t-remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume Sas
d
y
g
i
t-
r
emote-
m
edi
a
w
i
ki
:
scri
p
ts to install, delete
an
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Gary Gibbons
git p
4
: refactor diffOp
t
s calcul
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
P
ete Wyckoff
git p4:
notice Job
s
lines in git com
m
it m
e
ssages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Pete Wyckoff
git p4
test: refactor marsh
a
l_dump
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Pete W
y
ckoff
git p4: remo
v
e unused P4Submit i
n
teractive setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
M
i
chael
J
Gru
b
er
t
340
4
: make
test 57
w
ork
with dash and others
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Matthi
e
u Moy
gi
t
-remote-mediawiki: improve support for non-Engli
s
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Junio C H
a
mano
Four
t
h
ba
t
ch fo
r
1
.
7
.
1
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Junio C
H
am
a
no
M
e
rge b
r
anch 'nd/clone-sing
l
e-fix'
commit
|
commitdiff
|
tree
2012-07-05
Junio C
H
a
ma
n
o
M
erge branch 'th/diff-no-inde
x
-f
i
xes'
commit
|
commitdiff
|
tree
2012-07-05
Junio
C Hama
n
o
M
erge bran
c
h 'hv/remote-end-hung-up'
commit
|
commitdiff
|
tree
2012-07-03
Jeff
K
i
n
g
p
u
sh: don't guess at qualifyin
g
r
e
mo
t
e r
e
fs on deletion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Andreas Schwab
Fix fo
r
m
atting in git-confi
g
(1)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-02
Junio C
Ham
a
no
Sync with i18n-po
u
pd
a
t
es in maint
commit
|
commitdiff
|
tree
2012-07-02
J
unio C Hamano
Me
r
ge bra
n
c
h 'maint'
of git://github
.
com
/
gi
t
-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
J
u
ni
o
C Hamano
blam
e
: compu
t
e abbre
v
iation
w
idth
that ensures
uniquene
s
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-29
Johannes Sixt
p
erl/Makefile: Fix a missing double-quote
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ha
m
an
o
diff-index
.
c: "git diff"
has no
nee
d
to read
b
lob from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
Hamano
diff-index
.
c: unify handl
i
ng of command line paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
mano
diff-index
.
c: do not pretend
p
aths ar
e
p
a
t
hspecs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Hamano
T
hird
batch for
1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio
C
Ha
m
a
no
Merge br
a
nch 'fc/git-pr
o
mpt-scri
p
t'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Me
r
ge
b
r
a
n
ch 'j
s
/
s
u
b
module-relati
v
e'
commit
|
commitdiff
|
tree
next