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 'jl/submodule-conflicted-gitmodules' into next
2011-05-17
Junio C
Hamano
Merge branch 'jl/submodule-conflict
e
d-gitmod
u
les
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-17
Junio C Hamano
Merge bra
n
ch 'j
k
/cher
r
y-pick-root-wi
t
h-res
o
lve' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-17
Junio
C Hamano
Merge branch 'jc/rep
l
acin
g
' int
o
next
commit
|
commitdiff
|
tree
2011-05-17
J
u
ni
o
C Haman
o
M
e
rge branch
'
jk/git-connectio
n
-
deadlock-
f
i
x' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-17
Junio C Ha
m
ano
M
e
r
g
e br
a
nch 'js/maint-
s
e
nd-pack-statel
e
ss-rpc-dea
d
l
ock
.
.
.
commit
|
commitdiff
|
tree
2011-05-17
Junio C Ha
m
ano
Merge br
a
nch 'mast
e
r' into
n
ext
commit
|
commitdiff
|
tree
2011-05-17
J
u
nio C Ha
m
ano
U
p
d
ate 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
Merge branch 'js/ma
i
nt-1
.
6
.
6-se
n
d-
p
ack-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
M
e
r
g
e branch 'jc/conve
r
t'
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
Me
r
ge br
a
nch 'ci/commit--intera
c
tive-atomic'
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
i
o C
H
am
a
no
Merge b
r
anch 's
g
/completion-updates'
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
Merg
e
branc
h
'kk/maint-prefix
-
in-config-mak'
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Ham
a
no
Merge b
r
anch 'mg/merge-f
f
-conf
i
g'
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio
C
Ham
a
no
U
p
date
d
r
a
f
t
release notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C
Hamano
M
erge b
r
anc
h
'jn
/
m
aint-f
o
rmat
-
patch-doc' into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Merge branch 'ss/cherry-pick-x-doc' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C
H
amano
M
e
rge branch 'vr/merge-base-
d
oc'
i
nto
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C H
a
mano
M
erge
b
ranch
'
sr
/
m
ai
n
t-fast-
i
mport
-
tighten-option-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge br
a
nch 'jc/t1
5
06-sh
e
ll-param-expansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C
Hamano
Merge branch 'jc/fix-add-u
-
u
n
mer
g
ed' into maint
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C H
a
mano
Merge branch 'jn/git
w
eb
-
dependency' into m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
rge
b
ranch
'
j
c
/
ma
i
n
t
-branch-me
r
geoptions' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hama
n
o
M
erge branch 'jc/maint-add-p
-
ove
r
la
p
ping-hu
n
ks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Haman
o
sideband
_
demux(): fix decl-after-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
Merge branch 'mk/grep-pcre' into
next
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
Makef
i
l
e
:
Pas
s
U
S
E_LIBPCRE down
i
n G
I
T-BUIL
D
-OPT
I
ONS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
git-grep:
u
pdate tests now regexp type is "la
s
t one
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
Merge b
r
anch 'nd/
s
parse-co-fix' into
next
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hama
n
o
Merge b
r
anch 'jk/blame-line-po
r
celain' into next
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge
b
ran
c
h 'ld/p4
-
pre
s
e
r
ve
-
use
r
-
names'
into
next
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Mer
g
e bran
c
h 'jc/bigfi
l
e' into next
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hama
n
o
Merge branch 'jc/main
t
-p
a
thsp
e
c-stdin
-
and-c
m
dlin
e
'
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
Merg
e
branch 'm
s
/tagname
-
does-not-begi
n
-with-dash'
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C
H
a
mano
Merge branch 'm
k
/
g
rep
-
pcre
'
i
n
to next
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
Merg
e
branch 'jc/convert' into next
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
M
erge b
r
an
c
h 'master' int
o
next
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Syn
c
re
l
ea
s
e 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 Hamano
M
e
r
g
e
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
U
p
date draft release not
e
s to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Haman
o
Mer
g
e
bra
n
ch 'cn/format-patch-quiet
'
into maint
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hamano
Merge
b
ranch 'jm
/
mergetool-
s
u
b
modules
'
into maint
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Hama
n
o
M
er
g
e branch 'jk
/
for
m
at-patch-qu
o
te-special
-
in-fr
o
m
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge b
r
anch 'vh/git-svn-doc' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-15
J
unio C
H
amano
gi
t
_open
_
noat
i
me(
)
: dro
p
unus
e
d parame
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
s
ha1_file: ty
p
o
fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
r
e
ad_
s
h
a1_file(): allow selective bypassing
o
f
replacem
e
nt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hamano
i
n
line lookup_
r
eplace_object() c
a
lls
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
e
ad_s
h
a1_f
i
l
e
_repl()
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hama
n
o
t6050: make sure we test not just commit replac
e
men
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
amano
Declare lookup
_
replace_o
b
ject()
i
n ca
c
he
.
h, not in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Mer
g
e branch 'master' into
n
ext
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branc
h
'
m
ai
n
t
'
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o
C
Hama
n
o
Bigfile:
t
e
a
ch "git add" to send a
l
arge
f
i
le straight
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
M
erg
e
branch
'
maste
r
' into ne
x
t
commit
|
commitdiff
|
tree
2011-05-13
J
unio C
Hamano
Update
d
r
a
ft release notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
J
unio
C Haman
o
Merge
branch 'bf/commit
-
template-no-clean
u
p'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jc/t1506-shell-p
a
ram-expan
s
ion-gotcha'
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C Hamano
Merge branch 'rr
/
rerere
-
libify-clear-g
c
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
Merge br
a
nc
h
'
js/maint-send-pa
c
k-s
t
atele
s
s-r
p
c-dead
l
o
c
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
ma
n
o
M
e
rge branch 'jh/dirst
a
t-lines'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Mer
g
e br
a
nc
h
'jc/fi
x
-add-u-unmerged
'
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Merge b
r
a
nch 'jn/setup-revision
s
-glob-a
n
d-friend
s
-pa
s
sthru'
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merge branch 'cn/l
o
g-parse-opt'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
a
m
ano
M
e
rge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C
Hamano
Prepare for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge
bran
c
h 'a
w
/
maint-rebase-i-p-
n
o-ff' i
n
t
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
Me
r
ge branc
h
'js/blame
-
parse
n
am
e
'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rge b
r
anch 'gr/c
v
simpo
r
t-alter
n
at
i
ve-cvspass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Me
r
ge
b
r
anch 'cj/
p
4merge' in
t
o
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Ha
m
an
o
Merge branch 'jk/merge-one
-
file-w
o
rk
i
ng-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Haman
o
M
er
g
e bra
n
ch 'jc/fi
x
-diff-files-unmer
g
ed' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
b
ranch 'mz/mai
n
t-rename-unmerg
e
d'
into
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
ma
n
o
Me
r
ge b
r
anch 'jc
/
magi
c
-pathspec'
i
n
t
o next
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Me
r
ge b
r
anch
'
maste
r
' i
n
to next
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C H
a
mano
Merge branch 'nd/struct-pathspec'
commit
|
commitdiff
|
tree
2011-05-12
Juni
o
C Hamano
Merge branch 'jc/magic-pathspec' into next
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hamano
Merg
e
b
ranch 'jc/
m
a
i
n
t-1
.
7
.
4
-pathsp
e
c-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
i
o
C Hamano
rev
i
sion
.
c: le
a
v
e
a note for "a l
o
n
e :" enhancemen
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o
C Hamano
Merge
b
ran
c
h 'j
c
/maint-1
.
6
.
6-pathspec-st
d
in-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
Hamano
M
erge b
r
anch 'jc/maint
-
1
.
6
.
6-
p
athspec-
s
tdin-a
n
d-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o C
H
amano
s
etup_r
e
visions(): take pathspec
f
rom
c
o
mmand l
i
ne
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio
C
Hamano
Merge branch
'
master' into next
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
Ham
a
no
Update
d
raft
r
elea
s
e n
o
t
es to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o C Hamano
Merge b
r
a
nc
h
'jn
/
gitwe
b
-
de
p
endency'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch 'jc/maint-branch-m
e
rgeoptions'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
M
e
rg
e
branch 'jn/maint-test-merge-verify-parents
'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Haman
o
Me
r
ge
br
a
nch '
v
h
/con
f
i
g
-i
n
teracti
v
e-si
n
glekey-doc'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hama
n
o
M
e
rge
b
ranch
'jc/maint-add-
p
-overlapping
-
hunks'
commit
|
commitdiff
|
tree
2011-05-11
J
u
n
io
C Hamano
Merge branch '
s
r/main
t
-fast-import-ti
g
hten-option-
p
arsing'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
Haman
o
M
e
rge branch 'dm/ht
t
p-cleanup'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ha
m
a
n
o
Merge branch 'jn/ctags'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Hamano
M
e
rge
b
r
anc
h
'bf/
c
omm
i
t-te
m
p
l
ate-no-cleanup'
i
n
to
n
e
xt
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io C Hamano
Merge branch 'ci/comm
i
t--inter
a
ctiv
e
-at
o
m
i
c
'
into n
e
x
t
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hama
n
o
Merge br
a
nch 'rr/rerere-libif
y
-
c
lear-gc' i
n
to next
commit
|
commitdiff
|
tree
2011-05-11
J
unio C
Ham
a
no
Merge branch 'jc/t
1
5
06-s
h
ell-param-expansio
n
-gotch
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch 'ld/p4-pre
s
erv
e
-user-names' (earl
y
part
.
.
.
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Hama
n
o
Merge branch 'j
c
/mag
i
c-pathspec' into next
commit
|
commitdiff
|
tree
2011-05-10
J
u
ni
o
C Haman
o
M
e
rge branch 'sg/completion-updates' into next
commit
|
commitdiff
|
tree
2011-05-10
Junio C Hamano
Merge branch 'fc/complet
i
on-zs
h
' in
t
o sg
/
completion
.
.
.
commit
|
commitdiff
|
tree
next