repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint'
2010-01-22
J
u
nio C Ha
m
a
n
o
Merge
b
ranch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-01-22
J
unio C
H
amano
m
erge-rec
u
r
s
ive:
do not return
N
ULL only
to cause segfault
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hamano
conflict-marker-s
i
z
e: add
t
es
t
and docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
Update draft relea
s
e n
o
te
s
to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Mer
g
e branch 'bw
/
cvsi
m
port'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio
C Ham
a
no
Merge branch '
j
c/checkout-merge-b
a
se'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
M
erge bra
n
ch 'ag/p
a
tch-header
-
verify'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hamano
Mer
g
e
b
ranch
'
jc/conflict
-
marker-size'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
ma
n
o
M
erge branch 'ag/main
t
-
apply-to
o
-large-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hamano
Mer
g
e b
r
anch 'ap/merge
-
backend
-
o
p
ts
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
a
m
ano
M
e
rge
b
ranch 'nd/status-partia
l
-r
e
fresh'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
Merge remot
e
branch 'remotes/trast-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
aman
o
Merge br
a
n
c
h
'
j
h
/notes' (e
a
rly part)
commit
|
commitdiff
|
tree
2010-01-21
J
unio
C
Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
Me
r
ge bra
n
ch 'jc/maint-refr
e
sh-index-i
s
-optional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge branch 'r
r
/core-
t
utoria
l
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
ranch 'jc/cache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merg
e
b
r
a
nch 'js/exe
c
-error-repo
r
t'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
M
erge b
r
anch
'
jc/ls-files-ignored-pathsp
e
c'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
nch 'jc/grep-lookahe
a
d'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
mano
Merge branc
h
'
j
c/main
t
-strbuf-add-fix
-
do
u
b
l
i
ng'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'm
m
/conflic
t
-advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
ra
n
ch 'da/difftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
mano
Merge branch 'm
h
/rebase
-
fixup'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
M
erge branch 'ns/rebase-au
t
o-
s
quash'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C H
a
mano
Merg
e
branch 'mh/
r
eb
a
se-fixup'
(
early part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merg
e
br
a
nch 'il
/
p
ush
-
s
e
t-upstre
a
m'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge br
a
nch 'jk/
w
arn-auth
o
r-comm
i
tter-aft
e
r-c
o
mmit'
commit
|
commitdiff
|
tree
2010-01-20
J
uni
o
C Ha
m
ano
Merge br
a
nch '
j
c/ident'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C H
a
mano
M
e
rge branc
h
'tr/http-push-
r
ef-st
a
tus'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
branch 'b
k
/fix
-
relativ
e
-gitdir-file
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge branch 'sd/cd
-
p-
s
h
o
w-topl
e
vel'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Hamano
Merge branc
h
'jc/symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
da
t
e
.
c: mark
f
ile-
l
oc
a
l functio
n
stat
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o C Hamano
Sync
wi
t
h 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Git 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C
H
amano
M
erge bran
c
h
'bg/maint-r
e
mote-update-default' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hama
n
o
M
e
rge branch 'sb
/
maint-oct
o
pu
s
' into m
a
i
n
t
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o C Ham
a
no
Merge branch 'bg/maint-add-all-doc' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
an
o
Mer
g
e branch 'maint
-
1
.
6
.
5'
into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge b
r
anch 'jk/maint-1
.
6
.
5-re
s
et-h
a
rd' int
o
m
a
int
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge b
r
anch 'tr
/
maint-1
.
6
.
5-
b
ash-prompt-show-subm
o
dule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
un
i
o C Hama
n
o
Merge branch 'dp/ma
i
n
t
-1
.
6
.
5-fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge bran
c
h
'jm
/
m
ai
n
t-1
.
6
.
5
-
grep-NUL-terminate' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
Hamano
Fix "check
o
ut A
.
.
.
" syno
n
ym fo
r
"checkout A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
sta
t
us
:
d
o
n't require the repo
s
itory to be writable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merge branch
'
m
aint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Merge branch '
m
aint-1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Ha
m
a
n
o
Merg
e
branch
'
ma
i
nt-1
.
6
.
3' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C
H
amano
M
er
g
e
br
a
nch
'
maint-1
.
6
.
2' into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merg
e
commit 'v1
.
6
.
4
.
4-8-g8de6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hama
n
o
Fix
mis-backport
of t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
U
pdate draft release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C
Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
U
p
date
d
r
a
ft releas
e
n
o
tes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merg
e
branch 'dp
/
maint-1
.
6
.
5
-
fast-import-non-
c
ommit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o
C Hamano
Merge branch 'jc/r
e
rere'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C
Hama
n
o
Merge branch 'pc/uninteresting-submodule-disa
p
p
e
ar
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Me
r
g
e
branch
'
nd/includ
e
-te
r
m
i
o
s
-
for
-
o
sol'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Merge branch
'
js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Merge b
r
a
nch 'jm
/
maint-1
.
6
.
5-grep
-
NUL-termi
n
ate'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
symli
n
ks
.
c: remove un
u
sed funct
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Hamano
o
b
j
e
ct
.
c: remove unused
f
unctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Hamano
Docu
m
ent tha
t
me
r
ge
strat
e
gi
e
s
can now tak
e
th
e
ir own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio
C
Ha
m
ano
Make "subtree
"
part more orthogonal
t
o
t
he res
t
of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C Haman
o
pull: Fix parsing
o
f -X<opti
o
n>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Hamano
Up
d
ate draft release notes to
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge branch 'tc
/
test-locate-
h
ttpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge branch 'jh/
c
o
mmit-s
t
a
t
us'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Merge branch 'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
J
un
i
o
C Hamano
Merge bra
n
ch 'jc/maint-1
.
6
.
1-checkout
-
m-custom-merge
'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
Merge branch 'tc/cl
o
ne-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Me
r
g
e
br
a
nch 'tc/sm
a
rt-htt
p
-res
t
rict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
a
no
Mer
g
e b
r
anc
h
'jk/
r
u
n-c
o
mm
a
nd-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
Merge branc
h
'sr/gfi-opt
i
ons'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Update CO
P
YING with GPL
v
2
w
ith new FSF a
d
dress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
a
m
ano
u
s
e
r_ident_suf
f
iciently_give
n
(): refactor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o C
Hamano
user_ident_sufficiently_give
n
(): refactor
the l
o
gic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
r
e
rere: h
o
nor co
n
f
l
i
c
t
-
marker
-
size
a
t
t
ribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Ham
a
no
rerere: p
r
ep
a
re
fo
r
cust
o
miz
a
b
l
e conflict marker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
commit
.
c::prin
t
_
summary: do no
t
release
t
h
e
format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
conflict-marker-size: new attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
rerere:
use ll_merge() inst
e
ad of us
i
ng xdl_merge
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C Hamano
me
r
g
e-tree: use ll_merge()
not
x
dl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge(): allow passing dow
n
marker_s
i
ze in
xm
p
a
r
am_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
xdl_merge(): introd
u
ce
xm
p
aram_t for
m
er
g
e specif
i
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
g
it_attr(): fix fu
n
c
ti
o
n signat
u
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Ha
m
ano
Merge
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Me
r
ge branch 'cc/rese
t
-more'
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
grep --no-i
n
d
ex: allow use of "git grep"
o
utside a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
J
unio C Ham
a
n
o
grep: p
r
epare to run outsi
d
e
of a w
o
rk
tr
e
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io
C
H
a
mano
Merge bra
n
ch
'
jc/checkout-merge
-
b
a
se'
commit
|
commitdiff
|
tree
2010-01-13
J
unio C Hama
n
o
M
e
rge bran
c
h
'rs/maint-archive-match-
p
at
h
spec
'
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C Hama
n
o
Merg
e
bra
n
ch 'il/vcs-helper'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
Ha
m
ano
s
tr
b
uf_addbu
f
(): allow pass
i
ng the same buf to
dst
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge
b
r
a
n
ch 'cc/rese
t
-more'
commit
|
commitdiff
|
tree
2010-01-13
J
unio C
Hamano
Merge bra
n
ch 'nd/spars
e
'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
t75
0
2: test commit
.
status, --s
t
atu
s
an
d
--no-status
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C H
a
mano
grep: rip out
p
essimization to use f
i
xmatch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next