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 'mg/merge-ff-config'
2011-05-16
Junio C
Ha
m
ano
Merge branch 'mg/merge
-
ff-co
n
fig'
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
io C
H
a
m
ano
M
erge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Up
d
ate dra
f
t
rele
a
se note
s
to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
rge branch
'
jn
/
maint-format-
p
atch-doc
'
into main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
M
erge b
r
a
n
ch 'ss/cherry-pi
c
k-x-doc' i
n
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
Mer
g
e br
a
n
ch
'
v
r/merge-base-doc'
i
nto
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Merge branch 'sr/maint-fast-i
m
port-tighten-opt
i
o
n
-par
s
i
n
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
M
erge bran
c
h 'jc/
t
1506-shel
l
-para
m
-
e
xpa
n
sion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
M
e
rg
e
branch 'j
c
/fix-add-u
-
unmerge
d
' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge
b
ran
c
h 'jn/gitweb-depen
d
ency' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Merge
br
a
n
ch 'jc/maint-bra
n
ch-
m
ergeoptio
n
s' into
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
M
er
g
e branch 'jc/maint-add-p-over
l
a
ppin
g
-
hunks' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
aman
o
Sync
r
e
lease
n
o
tes f
o
r 1
.
7
.
6 t
o
exclud
e
what are in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
M
erge branch '
m
aint'
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
amano
Up
d
ate draft
r
elease
n
otes
t
o 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
Merg
e
bra
n
ch 'cn/form
a
t-
p
atch-quiet' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
Merge branch 'jm/mergetool-submodule
s
' i
n
to m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
M
erge branch 'jk
/
for
m
at-patch-quo
t
e
-sp
e
c
ial-in-fr
o
m
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hamano
Merge
b
ranch '
v
h/
g
it-svn-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
git_o
p
en_noatim
e
(
)
: drop
unused pa
r
ameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C H
a
ma
n
o
sha1_fil
e
: typofi
x
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-13
Junio C Haman
o
Update draft release notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'bf/commit-te
m
pl
a
t
e-no-cleanup'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
H
a
mano
Merge branc
h
'jc/t
1
506
-
shell-param-expansion-gotch
a
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Merge branch 'rr/rer
e
re-l
i
bify
-
clear-
g
c'
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C
Hamano
Merge b
r
anc
h
'js
/
m
aint-
s
e
nd-pack-stateless
-
rpc-deadl
o
ck
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Me
r
ge
b
ranc
h
'jh/
d
i
rstat-lines'
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
io
C
Hamano
Merge branch 'j
c
/fix-add
-
u-
u
nmerged'
commit
|
commitdiff
|
tree
2011-05-13
J
unio C
H
amano
Merge branch '
j
n/setup-revisio
n
s-g
l
o
b-and
-
f
rien
d
s-passthru'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
Merg
e
branc
h
'cn
/
log-
p
arse
-
opt'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
a
no
Me
r
ge branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Prepare for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
J
un
i
o C Hamano
M
erg
e
branch
'aw/maint
-
r
e
ba
s
e-i-p-no-ff' into
maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Ha
m
a
n
o
M
erge
branc
h
'js/blame-parsena
m
e
' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
unio C H
a
mano
M
e
rge br
a
n
c
h
'gr/cvsimport-alternative-
c
vs
p
ass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C
H
amano
Merge b
r
anch 'cj/
p
4merge'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C H
a
mano
Merge br
a
n
ch 'jk/merge-one-file-wo
r
king-tree'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C
H
am
a
no
Merge bra
n
ch 'jc/fix-diff-files-unme
r
ged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
Me
r
ge branch 'mz/
m
aint-re
n
ame-unmerg
e
d' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Merge branch 'nd/stru
c
t
-pathsp
e
c'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
U
pdate draft
release notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch
'
jn/gitweb-dependency'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
M
erg
e
branch 'jc/maint-branc
h
-merge
o
ptio
n
s'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
Hamano
Merge b
r
a
n
c
h
'jn/mai
n
t-t
e
st-mer
g
e-verify-parents'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hama
n
o
M
erge branch 'vh/config-i
n
teractive-singlekey-doc'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hamano
Merg
e
bran
c
h
'j
c
/mai
n
t
-add-p-overlapping-hun
k
s'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
M
e
r
ge b
r
anc
h
'
sr/maint-fast-im
p
ort-ti
g
hten-option-parsing'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge b
r
an
c
h 'dm
/
http-cleanup'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Hamano
Merge branc
h
'jn
/
ctags'
commit
|
commitdiff
|
tree
2011-05-09
J
u
nio C Hama
n
o
t1507: avoid "$
{
para
m
eter<o
p
>'word'}" inside
d
o
uble
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
J
u
nio C H
a
mano
t
3
7
01
:
add-p-fix makes
t
h
e
last test to pass
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio
C Ha
m
ano
rerere: libify
r
e
re
r
e_clear() and rerere_
g
c()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio
C Hamano
m
e
rge
:
introduce merge
.
ff
configuration variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o C
Ham
a
no
Merge br
a
nch 'jc/m
a
int-bra
n
ch-me
r
geoption
s
' into mg
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Hamano
merge: make bra
n
ch
.
<
n
a
m
e>
.
m
ergeoptio
n
s
c
orrectly over
r
ide
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
unio C Hamano
Update
d
ra
f
t release notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Ha
m
ano
Merge branch 'jn/run-co
m
ma
n
d-err
o
r
-f
a
i
l
ure'
commit
|
commitdiff
|
tree
2011-05-06
J
unio C Hamano
Merge bra
n
ch 'js
/
info-man-path'
commit
|
commitdiff
|
tree
2011-05-06
Junio C H
a
mano
Merg
e
bran
c
h
'im/hashcmp-o
p
tim'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C Hamano
Merge branch
'jk/
m
erge-o
n
e-file-worki
n
g-tree
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge b
r
anch 'jc/fix-diff-file
s
-unmerged'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C Hamano
Me
r
ge bran
c
h 'cj/p4m
e
rge'
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Hamano
Merge branch
'gr/cvsimp
o
r
t
-alternativ
e
-
c
vspa
s
s-
l
oca
t
ion'
commit
|
commitdiff
|
tree
2011-05-06
Junio C H
a
mano
Merge branch 'sg/co
m
pleti
o
n-cleanup'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Mer
g
e branc
h
'js
/
bla
m
e
-
parsename'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Ha
m
ano
Merge bran
c
h 'jk/format-patch-q
u
ot
e
-sp
e
cial
-
i
n
-fro
m
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Haman
o
Mer
g
e branch 'nd/struct-pathsp
e
c'
commit
|
commitdiff
|
tree
2011-05-06
J
unio C H
a
m
ano
Merge branch 'a
w
/main
t
-rebase-i-p-no-ff'
commit
|
commitdiff
|
tree
2011-05-06
J
unio
C Hamano
Merge bran
c
h
'
mg
/
a
l
ias-expose
-
prefix'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge
branch 'mg/d
i
ff-uic
o
nfig-doc'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hama
n
o
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2011-05-05
Juni
o
C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2011-05-05
Junio C
Hamano
Merge branch 'js/maint-1
.
6
.
6-se
n
d-p
a
ck-state
l
e
s
s-rp
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
t3701: fix here document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
H
amano
Upda
t
e
d
raft
r
e
le
a
se
n
otes
t
o 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'ml/test
-
readme
'
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
H
amano
Merge branch 'ft/gitweb-ta
r
-
w
ith-g
z
ip-n'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
b
r
a
n
ch 'mg/rev-list-count-cherry
'
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C
Hamano
Me
r
g
e
b
ran
c
h 'ss/
d
oc-svn'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'jn/format-p
a
tch-doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merg
e
branch
'
vr
/
merge-base-doc'
commit
|
commitdiff
|
tree
2011-05-04
J
unio
C Hamano
Merge branc
h
'ss/cher
r
y-
p
ick-x-doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
a
m
a
n
o
Mer
g
e bra
n
ch 'jn/main
t
-
f
o
r
mat-patch-doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge branch
'jk/forma
t
-pa
t
ch-multiline-header'
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Merge
branch 'jm/mergetool-sub
m
odules'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Sync wit
h
1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
i
o C Hamano
Git 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Me
r
ge branch
'
jh/dirst
a
t' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C
Hamano
Merge branch 'sp/maint-clear-
p
ostfield
s
' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
io C Hamano
Me
r
ge branch 'jk/maint-stash-oo
b
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Mer
g
e branch 'jk/maint-upload-pack-shallow' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
M
erge branch 'dm
/
stash
-
k
-
i
-
p' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C
H
am
a
n
o
Merge
b
ra
n
ch 'j
c
/pack-objects-big
f
il
e
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
aman
o
Mer
g
e branch 'mg/reflog
-
wit
h
-options' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Merge branch 'j
k
/stash-loosen-safety' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
M
erg
e
branch 'ar/clean-rmdi
r
-empty' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Me
r
ge
branch 'mg/sha1-
p
ath-advise' into main
t
commit
|
commitdiff
|
tree
2011-05-02
Juni
o
C Hamano
Up
d
a
t
e d
r
a
f
t release notes t
o
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-02
Jun
i
o
C
H
a
man
o
Mer
g
e branch 'jk/notes-ui-update
s
'
commit
|
commitdiff
|
tree
next