repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jl/submodule-conflicted-gitmodules'
2011-05-20
J
u
n
io C Haman
o
Merge
bra
n
ch 'jl/submodule-conflicted-gitmodu
l
es'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Me
r
ge bra
n
ch 'jc/replacin
g
'
commit
|
commitdiff
|
tree
2011-05-20
Junio C
H
ama
n
o
Merge branch 'nd/sparse-co-fix'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Me
r
g
e
branch 'ld/p4-pre
s
erve-user-names'
commit
|
commitdiff
|
tree
2011-05-20
J
u
nio
C Haman
o
Merg
e
branch 'm
s
/tagname-does-not-begi
n
-w
i
th-da
s
h'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge
bra
n
ch 'jk/git-connectio
n
-
d
eadlock-fix'
commit
|
commitdiff
|
tree
2011-05-20
Jun
i
o C
H
amano
Merge branch 'js/ma
i
n
t-send-pa
c
k-statele
s
s
-rp
c
-de
a
dlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-20
Juni
o
C Hamano
Merge bra
n
ch 'jk/cherry-pick-root-with-resolve'
commit
|
commitdiff
|
tree
2011-05-20
J
unio
C
Hamano
Merge branch 'jc/maint-path
s
pec-s
t
d
i
n
-
a
n
d-
c
md
l
ine'
commit
|
commitdiff
|
tree
2011-05-20
Junio
C Hamano
M
e
rge 1
.
7
.
5
.
2 in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Reve
r
t
"
M
erge branch 'en/mer
g
e
-recur
s
ive'
"
commit
|
commitdiff
|
tree
2011-05-20
Junio C Haman
o
Git 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Junio C
Hama
n
o
Upda
t
e relea
s
e not
e
s to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Hamano
Merge bran
c
h 'js/mai
n
t-1
.
6
.
6
-send-pack-stateles
s
-rp
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
H
amano
Merge b
r
an
c
h
'j
c
/convert
'
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Haman
o
Merge
b
r
anch 'ci/commit--interactive-atomic'
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Ha
m
ano
Merge branch 'sg
/
comple
t
ion-updates'
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Merge bra
n
ch 'kk/maint-prefix
-
i
n
-config-mak'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
Merge branch 'mg/merge-ff-config'
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io
C
Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
an
o
Upd
a
te dra
f
t relea
s
e n
o
t
e
s to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge bran
c
h 'j
n
/maint-for
m
at-patch-doc' into
m
ai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Merge bra
n
ch 'ss/cherry-pi
c
k
-
x
-
doc' into main
t
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C
H
am
a
no
Mer
g
e
branch 'v
r
/
m
e
rge-base-do
c
' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Merge br
a
n
c
h
'
s
r
/maint-f
a
st-import-tighte
n
-o
p
tion-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch '
j
c
/
t
1
5
06-shel
l
-param-expansion
-
gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge
b
ranch 'jc/fix-add
-
u-
u
nmerged' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Merge
b
r
a
nch 'jn/gitweb-dep
e
ndency' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
i
o
C
Hamano
Me
r
g
e
b
r
a
nch 'jc
/
mai
n
t
-
b
ranch-merg
e
op
t
ions' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Ham
a
no
M
erge branch 'jc/mai
n
t
-
add-p-ov
e
r
l
app
i
ng-hunks'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
sideband_dem
u
x():
f
ix decl-after-stmt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o
C Hamano
S
y
n
c
relea
s
e no
t
es f
o
r 1
.
7
.
6 to exclude
w
hat are in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hamano
Merge branch
'ma
i
nt'
commit
|
commitdiff
|
tree
2011-05-15
J
unio
C
Hamano
U
pdate
draft release note
s
to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
M
e
rge branch 'cn/format-patch-quiet' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io
C
Hamano
Merge branc
h
'jm/mergetoo
l
-sub
m
odules' into maint
commit
|
commitdiff
|
tree
2011-05-15
J
uni
o
C Ham
a
no
M
e
rge branch 'jk
/
format-patc
h
-
quote-speci
a
l-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'vh/gi
t
-svn-doc' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
git_o
p
en_noa
t
ime():
drop unused p
a
rameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
unio C
H
a
mano
sh
a
1
_
fi
l
e: typof
i
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
amano
re
a
d_sha1_file(): a
l
low s
e
l
e
c
tive
by
p
assi
n
g of replacement
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hama
n
o
in
l
ine
l
o
okup_replace_object() cal
l
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
r
e
ad_sha1_file(
)
: get ri
d
of read_s
h
a
1
_
file_re
p
l()
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hamano
t6050:
m
ake s
u
re we test
not
just
co
m
mit r
e
pl
a
cement
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Declare lookup_replace_object() in cache
.
h,
not in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
m
a
n
o
M
erge
b
ra
n
ch
'ma
i
nt
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Update
d
raft r
e
l
ease
not
e
s t
o
1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Ham
a
n
o
Merge branc
h
'bf/commit-template-
n
o-c
l
eanup'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
erge branch 'j
c
/
t
1
5
0
6
-shell-p
a
r
am-expa
n
sion
-
got
c
h
a
'
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Merge branch
'r
r
/rerere
-
libify-c
l
ear-gc'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'js/maint
-
send-pack-stateless-rp
c
-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge branch 'jh/di
r
stat-lines'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge
branch 'jc/fix-add-u-unmerged'
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
Merge branch 'j
n
/setup-revisions-
g
lob-a
n
d-f
r
iends-passthru'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'cn/log
-
parse-opt'
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C
Hamano
Merge
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Pre
p
ar
e
for 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Haman
o
M
e
rge branch 'aw
/
maint-reb
a
se-i-p-no-ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hama
n
o
Merge
branc
h
'js/b
l
ame-pars
e
name' into
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C
Hamano
Merge bran
c
h 'g
r
/cvsimport-
a
lternative-cvspass-locat
i
o
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C
H
a
m
ano
Merge b
r
anch 'cj/p4merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jk/merge
-
one-file-work
i
ng-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Merge br
a
n
ch
'
jc/fix-di
f
f
-files-unmerged' into
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
a
no
Merge branch
'
mz/maint-rename-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
m
ano
Merge branc
h
'n
d
/st
r
uct-
p
athsp
e
c'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Haman
o
M
e
rge bra
n
c
h
'jc/maint-1
.
7
.
4-pa
t
hspec-st
d
in-and-cmdl
i
ne'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C H
a
mano
Merg
e
b
r
anch 'jc/maint-1
.
6
.
6
-
pat
h
s
pec-s
t
d
in-and
-
cmdli
n
e'
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io C Hamano
setup_revision
s
(): take pa
t
hspec f
r
om command line
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
J
unio C Ha
m
ano
Update
d
raft rel
e
ase n
o
tes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
Hamano
Me
r
ge br
a
nch 'jn/gitweb-dependency'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Haman
o
M
e
rge branch
'
jc/maint-branch-merg
e
options'
commit
|
commitdiff
|
tree
2011-05-11
J
unio C
Hamano
Merge bra
n
ch 'jn/mai
n
t-test-merge-v
e
r
ify-p
a
rents'
commit
|
commitdiff
|
tree
2011-05-11
J
u
n
i
o
C
H
amano
Merge branch 'v
h
/conf
i
g-
i
nteractive-singlekey-doc'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Haman
o
Merge branch
'jc/maint-add-p-overlap
p
ing
-
hun
k
s'
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io
C
Hamano
Merge branc
h
'sr/
m
aint-fas
t
-im
p
ort-tighte
n
-option-pars
i
ng'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
Ham
a
no
Merge
b
ranch '
d
m/h
t
tp-cleanup'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ham
a
no
M
e
rge branch 'jn/ctags'
commit
|
commitdiff
|
tree
2011-05-10
J
unio C
H
a
mano
M
e
r
g
e bra
n
ch 'fc/completion
-
zsh' into sg/comp
l
e
tion
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Junio C Haman
o
Revert "
c
o
m
pletion: d
o
n't declare 'l
o
cal w
o
rds' to
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Jun
i
o C Hamano
Rev
e
rt
"
Honor $
(
p
refix) set
i
n
config
.
mak*
whe
n
de
f
ining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
c
o
nvert: m
a
ke it
h
a
r
d
er t
o
screw up addin
g
a
c
o
n
v
e
rsio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
conve
r
t
:
make it safer to add
c
o
n
version attribut
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio C H
a
man
o
co
n
ve
r
t:
g
i
v
e saner na
m
es to crlf/eol
variables, t
y
pes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
J
u
ni
o
C Hamano
conv
e
rt
:
renam
e
the "eol" glob
a
l
v
a
ri
a
ble to "core_
e
ol"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C H
a
m
ano
t1507:
a
void "${parameter<o
p
>'word'}" ins
i
de double
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Ju
n
io
C Ham
a
no
t3701: a
d
d-p-fix makes the last test to pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Haman
o
rerere: libif
y
rerere_clea
r
() and rerere_gc()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o
C
Hamano
m
e
rge:
i
nt
r
oduce merge
.
ff configuration variabl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branch
'jc
/
main
t
-branch-m
e
r
geoptions' int
o
mg
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Ha
m
ano
m
erge: make branch
.
<name>
.
mergeoptions corr
e
ctly ov
e
rride
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Hamano
Update draft re
l
ease no
t
es to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C Hamano
Merge branch 'jn
/
ru
n
-co
m
mand-e
r
ror-failure'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branch 'js/i
n
f
o-man-path'
commit
|
commitdiff
|
tree
2011-05-06
Junio C H
a
mano
Merge bra
n
ch 'im/hashcmp-optim'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Hamano
Merge branch 'j
k
/merge-one-fi
l
e-working-
t
ree'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C H
a
mano
Merg
e
branch 'jc/
f
ix-diff-files-u
n
merged
'
commit
|
commitdiff
|
tree
2011-05-06
J
u
n
io C Hamano
Merge
b
ranch 'cj/p4m
e
rge'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
M
e
rge branch 'gr/cvsimp
o
rt-alt
e
rnative-cvspass
-
location'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branch 's
g
/co
m
p
l
e
tio
n
-cleanup
'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C Hamano
Merge bra
n
c
h 'js/blam
e
-parse
n
ame'
commit
|
commitdiff
|
tree
next