repo.or.cz
/
git
/
mjg.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/replacing'
2011-05-20
J
unio
C Hamano
Merge branch 'jc/re
p
laci
n
g
'
commit
|
commitdiff
|
tree
2011-05-20
Junio C
H
am
a
n
o
Merge branc
h
'nd/sparse-co
-
fix
'
commit
|
commitdiff
|
tree
2011-05-20
J
unio C Hamano
Merge bran
c
h 'ld/p4-
p
reserve-user-names'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge branch 'ms/t
a
gna
m
e-does-n
o
t-begin-with-dash'
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
H
a
ma
n
o
Merge branch '
j
k/git
-
connection-deadl
o
ck-fix'
commit
|
commitdiff
|
tree
2011-05-20
Juni
o
C Hamano
Merge
b
ranch
'js/mai
n
t-send-pack-
s
tateless-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-20
Junio C H
a
man
o
Me
r
ge br
a
n
c
h 'jk/cherry-p
i
ck
-
root-with
-
resolve'
commit
|
commitdiff
|
tree
2011-05-20
Junio C
H
amano
Merge b
r
a
nch 'jc/maint-pathspe
c
-s
t
din-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-20
J
unio 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
Hama
n
o
Re
v
ert "Merge branch 'en/merge-recursive'"
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Git 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Ju
n
io C H
a
mano
Update release
n
o
t
es to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Ju
n
io C Haman
o
M
e
r
g
e branch 'js/ma
i
nt-1
.
6
.
6-send-pack-s
t
ateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
Merg
e
b
ranch 'jc/
c
onvert'
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Merge branch 'ci/co
m
mit--interact
i
ve-atom
i
c'
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Haman
o
Merge
b
ran
c
h 'sg/completion-
u
pd
a
tes'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
n
o
Merge branch 'kk/main
t
-prefix-in-config-mak'
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Ha
m
ano
Merge branch 'mg/merge-f
f
-config'
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
man
o
Merge
branch 'ma
i
n
t'
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Update dra
f
t
release
notes
to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Me
r
ge branch 'jn/maint
-
forma
t
-patch-doc'
i
nto
m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
a
m
ano
M
e
rge
branc
h
'
s
s
/
ch
e
rr
y
-pick-x
-
doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Merge bra
n
ch
'
vr/merge-base
-
doc'
i
nto
mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C
Hamano
M
er
g
e bran
c
h 'sr/maint-fast-import-
t
i
ghten-option-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge bran
c
h 'jc/
t
1506-shell-param-
e
x
p
ansi
o
n
-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Merge br
a
n
c
h 'jc/fix-add-u-unmerged'
i
nto
m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branc
h
'
jn/gitweb-depe
n
de
n
cy' int
o
main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
rge branch 'jc/
m
aint-branch-mer
g
eo
p
tions'
into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch '
j
c/m
a
int-add-p-overlapping-
h
u
n
ks' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
sideband_demux(
)
: fix decl-aft
e
r-stmt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
Sync r
e
l
e
ase notes for 1
.
7
.
6 to
exclude what are in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Hamano
Update draft release notes to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Me
r
ge branc
h
'cn/form
a
t-pa
t
ch-
q
uiet' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
Mer
g
e branch 'jm/mergetool-submodules' into maint
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hamano
M
erge branch 'jk/f
o
rmat-patch-quote-
s
pecial-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
Merge branch 'vh/git
-
svn-doc'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
g
i
t
_
open_noatime
(
): drop unuse
d
parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hama
n
o
sha1_file: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Haman
o
read
_
sha1_file(): allow selec
t
ive byp
a
s
s
ing of replacement
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
inline lookup_repla
c
e_
o
bject() call
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hamano
read_sha1_file(): get
r
id of
r
ead_
s
h
a
1_file_repl()
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io
C Hamano
t6
0
50: ma
k
e sure w
e
test not jus
t
commit replace
m
en
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
D
e
clare lookup_re
p
l
ac
e
_o
b
j
ect() in cache
.
h
, n
o
t
in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
M
erg
e
branch 'maint'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Update draf
t
releas
e
note
s
to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge bra
n
ch 'bf/comm
i
t-template-no-cleanup'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
Merge branch
'
jc/t1506-shell-param-expansion-gotcha'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge branch 'rr/rere
r
e-libify-clear-gc'
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Merge branch 'j
s
/maint-sen
d
-
pack-statel
e
ss-r
p
c-de
a
dlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hama
n
o
Mer
g
e
branch 'jh/dirstat-lin
e
s'
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
M
erge
branch 'jc
/
fix-a
d
d-u-unm
e
rged'
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Merge branch '
j
n/setup-revisions-glo
b
-and-f
r
ie
n
ds-pa
s
sth
r
u
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge bra
n
ch
'cn/
l
og-par
s
e-opt'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
ma
n
o
Prepare fo
r
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C H
a
m
an
o
M
e
rge branc
h
'aw/mai
n
t-rebase-i-p-no-ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Mer
g
e branch 'js/bl
a
m
e
-p
a
rsename' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'gr/cv
s
i
mport-alternative-cv
s
pass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Merg
e
b
r
anch 'cj/p4merge' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Me
r
ge branch 'jk/merge
-
one-f
i
le-working-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Haman
o
Merge b
r
anch 'jc/fix-dif
f
-f
i
les-un
m
erged' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
J
u
ni
o
C Hama
n
o
Me
r
g
e
branch
'mz/
m
ain
t
-rename-unmer
g
ed'
i
nt
o
main
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
b
r
anch 'nd/stru
c
t-pathspec'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Hamano
M
e
rge branch 'jc/maint-1
.
7
.
4-pathspec-st
d
in-
a
n
d
-cm
d
line'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Hamano
Merge branch 'j
c
/maint-
1
.
6
.
6-p
a
thspec
-
stdin-
a
nd-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
s
e
tup_revisions()
:
ta
k
e pathspec from command line
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Ham
a
no
U
pd
a
te
draft relea
s
e
n
otes
t
o 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io C Hama
n
o
Mer
g
e branch 'jn/gitw
e
b-depende
n
cy'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Mer
g
e bran
c
h 'jc/maint-branch-
m
ergeoptions'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch 'jn/mai
n
t-t
e
st-merge-
v
erify-parent
s
'
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o C Hamano
Merge bra
n
ch 'vh/config-interactive-s
i
nglekey-doc'
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io C
H
amano
Merge
branch 'jc/maint-add-p-overlappi
n
g
-
hunks'
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io C Hamano
Merge
b
ranch '
s
r
/maint-fast-impo
r
t
-
t
ighten-op
t
io
n
-p
a
rs
i
ng'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Haman
o
Merge
b
ranch '
d
m/h
t
tp-cleanup'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ham
a
n
o
Merge branch '
j
n/ct
a
g
s
'
commit
|
commitdiff
|
tree
2011-05-10
Junio C Hamano
Merge branch 'fc/completi
o
n-zsh'
into sg/comp
l
etion
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Junio
C
Ha
m
ano
R
e
vert "com
p
le
t
ion: don't declar
e
'local w
o
rds'
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Juni
o
C Hamano
Rev
e
rt "Hon
o
r $(pre
f
ix) se
t
in confi
g
.
mak* when defining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C Haman
o
co
n
v
er
t
: make
it harder
t
o
s
crew
u
p a
d
di
n
g a conversion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Ju
n
io C Hamano
convert: make it safer to add conversion att
r
ibutes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Ju
n
io C Hamano
co
n
v
e
rt:
give saner names
t
o crlf
/
eol variables, typ
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio C H
a
mano
c
onvert
:
rename
t
he "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
:
avoid "${parameter
<
op
>
'word'}"
inside d
o
uble
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Ham
a
n
o
t
3
701: add-p-f
i
x makes the l
a
s
t te
s
t
t
o
pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Juni
o
C Hamano
rerere
:
l
ibify rerere_clea
r
() and rerere_
g
c()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Ham
a
no
merge: introduce merge
.
ff
configu
r
a
t
ion variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hama
n
o
Merge branch 'jc/maint-branch-
m
er
g
eopti
o
ns' into mg
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
m
e
r
ge: make bra
n
ch
.
<nam
e
>
.
mergeoptions
correctly ov
e
rride
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio C H
a
mano
Update dr
a
f
t
re
l
e
a
se notes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Ha
m
ano
Merge br
a
nch 'j
n
/
run-comma
n
d-error-failur
e
'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Hamano
Merge branc
h
'js/info
-
man-path'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C Ha
m
ano
Merge branch 'i
m
/hashcmp-optim'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Hamano
Merge branch 'jk/merge-one-file-w
o
rking
-
t
ree'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Hamano
Merge b
r
anch 'j
c
/fi
x
-diff-files-u
n
mer
g
ed
'
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o C Ham
a
n
o
Merge branch 'cj/p4merge
'
commit
|
commitdiff
|
tree
2011-05-06
J
unio C Hamano
Me
r
ge branch 'gr
/
cvsimpo
r
t-alternati
v
e-cvs
p
ass-location'
commit
|
commitdiff
|
tree
2011-05-06
J
unio C Hamano
Merg
e
branc
h
'
sg
/
completion-cleanup'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Ham
a
no
Merge branch 'js/blame-pa
r
s
en
a
me'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Haman
o
Merge bran
c
h 'jk/f
o
rm
a
t-patch-quot
e
-special-in-from
'
commit
|
commitdiff
|
tree
next