repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'bw/cvsimport' into next
2010-01-20
Junio C
Hamano
Merg
e
bran
c
h 'bw/cvsimport
'
into ne
x
t
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C
Hamano
Merge branc
h
'jc/checkout-me
r
ge-base' into
next
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merg
e
branch 'il/rev-namespace
'
int
o
next
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Ham
a
n
o
Merge branch 'nd/stat
u
s-partial-refresh' in
t
o next
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
nch 'jc/
i
d
e
nt' into nex
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge branc
h
'master' into next
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Fix "check
o
ut A
.
.
.
" sy
n
o
n
ym for "checkout A
.
.
.
HEA
D
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Me
r
ge branch '
m
aint
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merg
e
br
a
nch 'a
g
/patc
h
-
header-verify' in
t
o next
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hama
n
o
Merge branc
h
'jc/con
f
l
ict-ma
r
ker-
s
ize' into
n
ext
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merg
e
bran
c
h 'il/remot
e
-u
p
da
t
es' into next
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
M
erge bran
c
h
'il/
b
r
a
nch-set-
u
pst
r
eam'
i
nto
next
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Merge
b
ranch 'i
l
/rev-namespace'
into next
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Ham
a
n
o
Merge br
a
nch
'
a
g
/m
a
int-apply-too-lar
g
e-
p
' into next
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
M
erg
e
branch 'ap/mer
g
e-
b
a
ckend-opt
s
'
into ne
x
t
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
branch 'j
c
/sym
b
ol-
s
tatic' into next
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Mer
g
e bra
n
ch
'
master'
i
nto next
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
U
p
d
a
t
e draft releas
e
n
o
t
es to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
U
pdate draft release notes to 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Mer
g
e bran
c
h 'dp/maint-1
.
6
.
5-fast-import-non-commi
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Ham
a
no
M
e
r
ge b
r
anch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Mer
g
e branch 'pc/un
i
nteresting-submodule-disapp
e
ar
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
erge
branch 'nd/include-termios-
f
or-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Merge branch 'js/win
d
ows'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
i
o
C Hamano
M
erge bra
n
ch '
j
m/
m
aint-1
.
6
.
5-grep
-
N
UL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge
b
ra
n
ch 'j
c
/symbol-static' (ea
r
l
y part) into
n
ext
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
s
ymlinks
.
c: remove unuse
d
f
u
nctions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
object
.
c: remove un
u
sed functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o
C
Hamano
M
e
rge remote branch 'remotes/trast-doc/fo
r
-
n
ext' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C
Hamano
Document that merge strategies
c
a
n
n
o
w
t
ake their own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
Hamano
Make
"subtree
"
part
more orthogonal to the res
t
of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
H
amano
pul
l
:
F
ix parsing o
f
-
X<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
Merge branch 'm
a
ster' into next
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
Update draft release notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
Merge branch
'
tc/test-locat
e
-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
M
erge bra
n
ch 'jh/co
m
mit-status'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
M
e
r
g
e branch 'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'jc/maint-1
.
6
.
1-c
h
eckout-m-custom
-
merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
ano
Me
r
ge br
a
n
c
h '
t
c/
c
l
o
ne-v-
p
r
ogress'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C
Hamano
Me
r
ge bran
c
h
'tc/
s
ma
r
t-http-restrict'
commit
|
commitdiff
|
tree
2010-01-17
J
un
i
o C Hamano
Merge b
r
anc
h
'jk/run
-
c
o
mm
a
nd-us
e
-shell'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Ha
m
ano
M
e
rge
branch 'sr
/
g
f
i-options'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge
b
ranch 'jl/
s
u
b
mod
u
le-
d
i
ff' into nex
t
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
Me
r
ge br
a
nch 'jc/grep-lo
o
kahe
a
d' into next
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C
H
amano
Merge branch
'jk
/
warn-au
t
h
o
r-commi
t
ter-af
t
er-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
M
e
rge
branch 'jc/i
d
ent' into n
e
xt
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
a
ma
n
o
U
p
date
COPYING with
G
PLv2 with new
F
SF address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
u
ser
_
ident_
s
u
f
ficie
n
tly
_
given(): refa
c
tor the
logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
user_iden
t
_sufficient
l
y
_given
(
): ref
a
ctor th
e
l
ogic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
re
r
ere: honor conf
l
i
c
t-marker-size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hama
n
o
rerere: prepare for customizab
l
e confli
c
t
m
arker length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Merge branch 'j
k
/wa
r
n-autho
r
-committer-after-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
c
o
mmit
.
c
:
:
p
r
i
nt_summary: do n
o
t
r
e
lease the
f
o
rmat
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
c
onfl
i
ct-m
a
rker-size
:
new attri
b
ute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io C Ham
a
n
o
rerere:
use
ll_me
r
ge() instead of using xd
l
_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
Haman
o
merge-tr
e
e:
use ll_merge() no
t
x
d
l
_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge(): allow pass
i
ng
d
o
wn marke
r
_siz
e
in xm
p
aram_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
amano
xdl_merge()
:
introduce xm
p
aram_t for merge specific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
git_attr():
f
ix f
u
nction signatur
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o
C
Hama
n
o
Mer
g
e b
r
anch 'n
d
/st
a
tus-
p
arti
a
l-refr
e
sh'
(
early pa
r
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
M
e
rge
b
ranch
'
r
r
/
cor
e
-tutorial' into
n
ext
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
Merge
branch
'
il/push-set-upstream' i
n
to next
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch
'
nd/incl
u
de-termios-for-osol' into next
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
Merge
b
r
a
nc
h
'
p
c/uni
n
ter
e
s
t
in
g
-submo
d
u
l
e-disap
p
ear
.
.
.
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'sd/cd-p-sh
o
w
-
toplevel'
i
nto nex
t
commit
|
commitdiff
|
tree
2010-01-17
J
un
i
o C
H
a
mano
Merge
branch 'jk/warn-
a
uthor-com
m
i
tte
r
-af
t
e
r
-
c
o
mmit
.
.
.
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Merge br
a
nc
h
'jl/submodule-diff' into
next
commit
|
commitdiff
|
tree
2010-01-17
J
un
i
o C
Hamano
Me
r
g
e br
a
nch 'mm/c
o
nflict-advi
c
e' into next
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
M
erge branch 'jc/maint-strb
u
f-add-fix
-
d
oubl
i
ng'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Merge branch 'bk/fi
x
-
r
el
a
tive-gitdir-file'
i
n
to
n
ext
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
Merge
b
ranch 'jc
/
ls-files-ignored-pathsp
e
c' into next
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
Mer
g
e branch 'js/exec-error-rep
o
rt'
into next
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C
Ha
m
ano
Merg
e
branch 'tr/http-push-ref-status'
into next
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'dp/
m
aint-
1
.
6
.
5-fast-imp
o
rt-n
o
n-com
m
it
.
.
.
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
Merge
b
ranch 'mh/rebase-fixup' int
o
next
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
Merge br
a
nch 'tc/smart
-
http-restrict
'
into nex
t
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hama
n
o
Merge branch 'da/difftool' into next
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
Merge branch 'master' int
o
next
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
Mer
g
e branch 'cc/
r
eset-more'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
Tea
c
h diff tha
t
mo
d
ified submodule directory is dirty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Jun
i
o C Hamano
grep --no-index: allow
u
s
e
o
f
"git grep
"
outside a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
gr
e
p: p
r
epare
t
o run outside of a work tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Haman
o
Merg
e
br
a
nch 'jc/grep-lookahead' into
n
e
xt
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C
H
amano
Merge branch 'jc/
f
ix-t
r
ee-w
a
l
k'
in
t
o
next
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merg
e
branch 'jc
/
cache-unmerge' into next
commit
|
commitdiff
|
tree
2010-01-13
J
u
n
i
o
C Haman
o
M
erge
branch 'jh/com
m
i
t
-statu
s
' into n
e
x
t
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Hamano
Merge
b
ranch
'
master' int
o
next
commit
|
commitdiff
|
tree
2010-01-13
Juni
o
C Hamano
M
e
r
ge branch 'jc/checkout-merge-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch 'rs/maint-archive-match-pathspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
amano
Merge bra
n
ch 'il/vcs-h
e
lper'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
strbuf
_
addbuf(): all
o
w p
a
ssing th
e
same bu
f
to ds
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
J
unio C Hamano
Merg
e
branch '
c
c/res
e
t-m
o
re'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
Haman
o
Merge branch 'nd
/
sparse
'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
H
a
mano
t
7502: tes
t
c
o
mmit
.
status,
-
-
status a
n
d --no-status
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Ham
a
no
grep: rip o
u
t pessimizat
i
on to use
f
ixmatch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
grep: rip out
s
u
pport
for external
g
rep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
Mer
g
e b
r
anch '
m
h/rebase-fixu
p
' into next
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C Hamano
Merge bran
c
h 'master' into next
commit
|
commitdiff
|
tree
next