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
nio C
Hamano
Merge
br
a
nch 'jl/submodu
l
e-
c
onflicted-gitmodules'
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
Hamano
Merge branch
'
jc/replacing'
commit
|
commitdiff
|
tree
2011-05-20
J
unio C H
a
mano
Merge br
a
nch '
n
d/spa
r
se-co
-
fi
x
'
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
Hamano
Merge
b
ranch 'l
d
/p4-preserve-u
s
er-names'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Me
r
ge branch 'ms
/
tagna
m
e
-
d
oes-not-beg
i
n-with-da
s
h
'
commit
|
commitdiff
|
tree
2011-05-20
J
u
nio C Hamano
Merge branc
h
'jk/git
-
conn
e
c
t
ion-de
a
d
l
ock-
f
ix'
commit
|
commitdiff
|
tree
2011-05-20
Jun
i
o C Ha
m
ano
Merg
e
branch 'js/maint
-
send-pack-statel
e
ss-rp
c
-d
e
a
dlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge branch 'jk/ch
e
r
ry-pick-root-
w
ith-resolve'
commit
|
commitdiff
|
tree
2011-05-20
J
unio C H
a
mano
Merge
bra
n
ch '
j
c
/ma
i
nt-pa
t
hspec-stdin
-
and-cmdline'
commit
|
commitdiff
|
tree
2011-05-20
Juni
o
C
Hamano
Merge
1
.
7
.
5
.
2 in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Revert
"Merge br
a
nch
'en/merge-
r
ec
u
rsive'"
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
H
aman
o
G
it
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio
C
H
amano
Update release notes t
o
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Hamano
Me
r
ge branch 'js/maint-1
.
6
.
6
-s
e
n
d
-
pack-sta
t
eless-
r
pc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
Merge branch 'jc/convert'
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge
branch '
c
i/commit--inter
a
c
tive-
a
tomic'
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
M
e
r
ge bran
c
h 'sg/complet
i
o
n-updates
'
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Merge branch
'kk/mai
n
t-prefix
-
in
-
confi
g
-mak'
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C
H
am
a
n
o
Me
r
ge branch
'
mg/merge-ff-
c
o
n
fig'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
Updat
e
draft release notes t
o
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
Merge branch
'
jn/maint-
f
ormat-patch-doc' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Ham
a
n
o
M
erge branch 'ss/cherry-pick-x-doc' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
man
o
Merge bran
c
h 'vr/merge
-
base-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Ha
m
a
no
Me
r
ge br
a
nch 'sr/m
a
int-fast-import-tigh
t
en
-
option-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jc
/
t1506
-
shell-param-exp
a
nsion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C
Hamano
Merge b
r
anch 'jc/fix-add-u-unmer
g
ed' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Merge bran
c
h 'jn/gitweb-dependency' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Mer
g
e bra
n
ch 'jc/ma
i
n
t-branch-merge
o
ptions' in
t
o
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Mer
g
e branch
'jc/maint-add
-
p
-ove
r
l
a
pping-h
u
nks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C
Hamano
sideband_demux(): f
i
x decl-after-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Sync release no
t
es
for 1
.
7
.
6 to
e
xclude what are in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-05-15
J
u
n
i
o C Ham
a
no
Update draft relea
s
e
n
ote
s
to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o
C Hamano
Merge b
r
a
n
ch
'
cn/
f
ormat-patch-quiet'
i
n
to
m
ai
n
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
Merge branc
h
'jm/
m
er
g
etool-submodules' into maint
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Ham
a
no
Merge
b
ranch
'
jk/format
-
patch-quote-special
-
in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
amano
Merge
b
ranch
'vh/
g
it-svn-doc' i
n
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
man
o
git_open_noatime(): drop unused paramete
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
sha1_file:
t
ypofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o
C
Hamano
read_sh
a
1
_file(): allow s
e
lective by
p
assing
of r
e
plac
e
ment
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C
Hama
n
o
inline lookup_replace_
o
bje
c
t() calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
H
amano
read_sha1_
f
i
l
e
(
): get rid of read_sha1_
f
il
e
_repl
(
)
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hama
n
o
t6050: make su
r
e we
t
e
st not just commit replacement
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
amano
Declare lo
o
kup_repl
a
ce
_
o
b
ject(
)
in cach
e
.
h, not in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
Mer
g
e branch 'm
a
i
n
t
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Update
d
raft release notes
to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
M
e
r
g
e branch 'b
f
/commit-template-no-
c
leanup'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
M
e
rge
b
ran
c
h 'jc/t1506-
s
h
el
l
-para
m
-ex
p
ansion-gotcha'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
H
amano
M
e
rge
branch 'rr/rerere-libify-clear-
g
c'
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merge
b
ranch 'js/ma
i
nt-send-pack-stateless
-
rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio
C
H
amano
Merge branch
'
jh/dirstat-lines'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
M
erge branch '
j
c/fi
x
-add-u-unme
r
ged'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jn/
s
etup-revisions-glob-
a
n
d-
f
rien
d
s
-p
a
sst
h
ru'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Merge branc
h
'
cn
/
l
og-parse-opt'
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Merge b
r
anch
'maint'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Prepare for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o
C Hamano
Merge branc
h
'
a
w/maint-reba
s
e
-i-p-n
o
-ff' into m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Mer
g
e bran
c
h 'js/blame-parsename' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branc
h
'
g
r/cvs
i
mport-alt
e
rnative-cvs
p
as
s
-
lo
c
a
t
ion
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge bra
n
ch 'cj/p4merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
H
amano
Merge branch
'jk/merge-one-file-
w
orking-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Me
r
ge branch
'
j
c/fix-diff-files-unm
e
rged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge b
r
anch 'mz/maint-rename
-
unmer
g
ed' into
maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio
C Ham
a
no
Me
r
g
e
branch
'
nd/struct
-
p
athspec
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge bra
n
ch 'j
c
/maint-1
.
7
.
4-pa
t
h
spec-stdi
n
-a
n
d-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Ha
m
a
n
o
Merge branc
h
'jc
/
maint-1
.
6
.
6-pathspe
c
-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
J
unio
C
Hamano
setup_revis
i
ons(): t
a
ke pathspec
from
c
ommand line
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio C
Hamano
U
pd
a
te d
r
aft release notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
J
u
n
i
o C Hamano
M
e
rge branch 'jn/g
i
t
w
e
b-dependency'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Hamano
M
e
rge bra
n
ch 'jc/ma
i
nt-branch-mergeoptio
n
s'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge bra
n
ch '
j
n/mai
n
t-test-
m
erge-verify-pare
n
t
s
'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio
C
H
amano
Me
r
ge branch 'vh
/
config-interactive-sing
l
ekey-doc'
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io
C Hamano
Merg
e
br
a
nch
'
jc/mai
n
t-add-p-overl
a
pping-hunk
s
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch '
s
r/maint-fast
-
impor
t
-tighten-optio
n
-parsing'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Hamano
M
erge branch 'dm/http-cleanup'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Hamano
Me
r
ge branc
h
'jn/ctags'
commit
|
commitdiff
|
tree
2011-05-10
Jun
i
o C Hamano
Merge branch
'
fc/completion-zsh' into sg/completion
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Junio
C
Hamano
Revert "completion: do
n
't declare 'local words' to
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
J
u
n
io C
H
a
m
ano
Rev
e
r
t "H
o
nor $(prefix)
set in config
.
mak* w
h
en definin
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C Ha
m
ano
convert: make it harder to scre
w
up adding
a conversio
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
J
unio C Hamano
convert: make it safer to
a
dd conve
r
sion attrib
u
tes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
convert: give saner na
m
es to
c
rlf/
e
o
l va
r
i
ables,
types
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
co
n
vert
:
r
enam
e
the
"eol" global variable to "core
_
eol"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hama
n
o
t1507: avoi
d
"${para
m
et
e
r<op>'
w
ord
'
}
"
inside double
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio
C H
a
mano
t
3
7
0
1:
a
d
d
-p
-
fix make
s
the l
a
st t
e
st to
pass
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C
Hama
n
o
rerere: li
b
ify rerere_clea
r
() and rerere_gc
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
u
n
io C Hamano
merge: introduce
mer
g
e
.
ff co
n
fig
u
ra
t
ion
variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
i
o
C
Hamano
Merge branch '
j
c/maint-branch-m
e
rgeoptions' into mg
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Hamano
merge: make b
r
anch
.
<name>
.
m
e
r
g
eop
t
ions correctly override
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C Hamano
Upda
t
e
draft release
n
otes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hama
n
o
Me
r
ge branch 'jn/run-com
m
and-
e
rror-failure'
commit
|
commitdiff
|
tree
2011-05-06
J
unio
C
Hama
n
o
Merge branch 'js/info-man-path'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
M
erge branch 'im/hashcmp
-
optim'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C Hamano
Merge branch 'jk/m
e
rge-one-
f
i
l
e-worki
n
g-tree'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C Ha
m
ano
M
e
r
g
e branch 'jc/fix-diff-files-unm
e
rged'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
M
e
rge branch 'cj/p4merge'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge br
a
nch 'gr/cvsimport-altern
a
t
i
v
e
-cv
s
pass-
l
ocation'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Hamano
Mer
g
e branc
h
'sg/c
o
mpletion-cl
e
anup'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merg
e
bra
n
ch 'js/blame-pars
e
name'
commit
|
commitdiff
|
tree
next