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 git://git.bogomips.org/git-svn
2010-01-23
J
unio C Hamano
M
erge
g
it://git
.
bogomips
.
o
r
g/git-svn
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hamano
Update draft release
n
otes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-23
Junio C Ha
m
ano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Ha
m
ano
Merge branch 'jc/b
r
anch-d'
commit
|
commitdiff
|
tree
2010-01-23
Jun
i
o C
H
amano
Mer
g
e
b
ranch 'il/rev-glob'
commit
|
commitdiff
|
tree
2010-01-23
Juni
o
C H
a
mano
Merge br
a
nch 'js/re
f
er-ups
t
ream'
commit
|
commitdiff
|
tree
2010-01-23
J
unio C
Hamano
M
erge branch 'jl/su
b
module-dif
f
'
commit
|
commitdiff
|
tree
2010-01-23
Jun
i
o
C Hamano
Merge br
a
nch 'il/remote-updates'
commit
|
commitdiff
|
tree
2010-01-23
Junio C H
a
m
a
no
Merge branch 'il/br
a
nch-set-up
s
t
r
eam'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hamano
Merg
e
branch 'j
c
/main
t
-limi
t
-note-o
u
tp
u
t'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hamano
Merge bran
c
h 'nd/
l
s-files-sparse-fix'
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
ignore duplicated slas
h
es in make_
r
elative_pa
t
h()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Junio
C
Hamano
git-mv: fix moving
m
ore t
h
an one source to a single
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Juni
o
C
Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-01-22
Junio C H
a
mano
merge-recursive: do not retur
n
NULL only t
o
cause seg
f
ault
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Fix
"
log --o
n
e
l
i
ne" not t
o
sho
w
not
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
conf
l
ict-mar
k
er-size: add test and docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
Update
d
raft
release notes to
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
erge branch
'b
w
/cvsimport'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ha
m
ano
Merge br
a
nch
'
jc/
c
he
c
kou
t
-merg
e
-base'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
e
rge branch 'ag/patch-header-v
e
rify'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C
H
aman
o
M
e
rge branch 'jc/confli
c
t-mark
e
r-
s
ize'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ha
m
an
o
Merge branch '
a
g/mai
n
t-apply-too-large-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ha
m
an
o
Merge branch 'ap/merge-backend
-
opts'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Haman
o
Merge branch 'nd
/
status-partial-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
Merge remote branch 'rem
o
t
es/trast-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Merge branch '
j
h
/
n
o
tes
'
(early part)
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
no
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ha
m
ano
Merge branch
'jc/maint-re
f
resh-index-is-op
t
i
onal-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Fix "log" family not to be too agressive abou
t
showing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bra
n
ch 'rr/co
r
e
-
tutorial
'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merg
e
branch 'jc/cache-unmerge
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
ni
o
C Hamano
Merge branc
h
'js/exec-error-report'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge branch 'jc/ls-files-ignored
-
pat
h
spec'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Ha
m
ano
M
e
r
g
e b
r
anch 'jc/grep-lookahead
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'
jc/maint-strbuf-
a
dd-fix-doubling'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branc
h
'mm/conflict-advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merg
e
branch 'da/diffto
o
l
'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hama
n
o
Merge branch 'mh/r
e
base-fi
x
up'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
H
a
m
a
n
o
Merg
e
branch 'ns
/
rebase-auto
-
sq
u
a
s
h'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
H
a
m
a
no
M
erge branc
h
'mh/
r
ebas
e
-fix
u
p
' (earl
y
part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'il/pus
h
-set
-
ups
t
rea
m
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge
b
ranc
h
'jk/warn-author-comm
i
tte
r
-after-c
o
mmit'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merg
e
branc
h
'jc
/
ident
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Me
r
g
e
branch 't
r
/http-pu
s
h-ref
-
status'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge br
a
nch
'bk/fix
-
relat
i
ve-gitdir-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge
branch 'sd/cd-p-show-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
M
erge branch 'jc
/
sym
b
ol-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
date
.
c
:
mark file-local function
s
t
atic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Sync with 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Git 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch '
b
g/maint-remote-u
p
da
t
e-def
a
u
l
t' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
amano
Merge branch
'sb/
m
aint-octopus' in
t
o m
a
int
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e branch 'bg/maint-add-all
-
doc' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge branch
'maint-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-20
J
u
ni
o
C Hamano
Gi
t
1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge branch 'jk/maint-1
.
6
.
5
-r
e
set-hard' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C Ham
a
no
Merge bra
n
ch 't
r
/maint-1
.
6
.
5
-
b
a
sh-prompt-show-subm
o
dule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge branch
'dp/maint-1
.
6
.
5-fa
s
t-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Me
r
ge
b
ranch 'jm/maint-1
.
6
.
5-grep-NUL-
t
erminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Ham
a
no
Teac
h
@{upstream} syntax to strbuf
_
branc
h
anme()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
t15
0
6
:
m
ore test for @{upstream} synt
a
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
H
amano
Fix "check
o
u
t
A
.
.
.
" s
y
nony
m
for "ch
e
ckou
t
A
.
.
.
HEAD
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
status: don't require the rep
o
sitory to be w
r
itable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
rge bran
c
h 'maint
-
1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Ham
a
no
M
e
rge
b
r
a
n
ch 'm
a
int-
1
.
6
.
3'
i
nto main
t
-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
M
erge branch 'maint-1
.
6
.
2
'
into mai
n
t-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
M
erge
c
om
m
it 'v
1
.
6
.
4
.
4-8-g8de6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Fix mi
s
-
b
ac
k
port o
f
t
7
002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Update draft releas
e
notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Merge bran
c
h
'main
t
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Update draft re
l
ease notes
t
o
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio
C Ha
m
ano
Merge branch 'dp/maint-1
.
6
.
5-fast-
i
mpor
t
-
non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Merge
branch 'jc/rere
r
e'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Merge b
r
anch 'pc/uninteresti
n
g
-
submodule
-
disappea
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'nd/inc
l
ude-termios-for
-
o
s
ol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Merge branch 'j
s
/windows'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge b
r
anch 'j
m
/
main
t
-1
.
6
.
5-grep-NUL-terminate'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
io C Hamano
sym
l
in
k
s
.
c: remove unused
f
u
nctions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
object
.
c: remo
v
e
u
nused functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
mano
Doc
u
ment that mer
g
e st
r
ate
g
ies can now tak
e
their
own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
Make "s
u
b
t
ree
"
part more or
t
hogonal to
t
he rest
o
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
pull:
F
ix parsing
o
f -X<opt
i
o
n>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
Update draft re
l
ease notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
M
e
rge branc
h
'
t
c
/tes
t
-locate-h
t
tpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
ano
Merge br
a
nch '
j
h/com
m
it-st
a
tus'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge
b
ranch 'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
M
er
g
e
branc
h
'jc/mai
n
t-1
.
6
.
1-checkout-m-custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
a
mano
Merge br
a
n
c
h 't
c
/clo
n
e-v-progres
s
'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C
Hamano
Merg
e
branch 'tc/
s
mart
-
h
t
tp-restrict'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o
C Hamano
M
e
rge bra
n
ch 'jk/
r
un-command-use-sh
e
l
l
'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merge branch 'sr/gf
i
-
o
ptions'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
a
m
an
o
Update COPYING with
GPL
v
2 with n
e
w
F
SF
a
ddress
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_ident_suff
i
c
ie
n
t
l
y_given(): refactor the l
o
gic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C
H
a
man
o
user_ident_s
u
fficien
t
ly_give
n
(): refa
c
t
or th
e
logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C H
a
man
o
re
r
e
re: honor conflict-marker-size at
t
ribut
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
rerere: p
r
epare
f
or
c
u
s
tomi
z
a
ble conflict m
a
rker length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
commi
t
.
c::print_summary:
d
o not release
t
he
fo
r
m
a
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
conflict-marker-size: new at
t
ribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next