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 'maint'
2010-01-23
Junio C
H
a
mano
Merge branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hamano
Merge branc
h
'jc/
b
ranch-d'
commit
|
commitdiff
|
tree
2010-01-23
J
unio C Hamano
Merge bra
n
ch
'
il/rev-glo
b
'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hamano
Merge
b
ranch
'js/refer-upstream'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hamano
Mer
g
e branch 'jl/su
b
mo
d
ule-diff'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hama
n
o
Merge
b
ranch 'il/remote
-
u
p
dates'
commit
|
commitdiff
|
tree
2010-01-23
Jun
i
o C Hamano
Merge branch
'
i
l
/
branch-set
-
upstream'
commit
|
commitdiff
|
tree
2010-01-23
Juni
o
C Hamano
Merge b
r
anch 'jc/maint-limit-note-ou
t
p
u
t'
commit
|
commitdiff
|
tree
2010-01-23
Junio
C
Ham
a
no
Merge branch 'nd/ls-
f
iles
-
s
p
a
rse-
f
ix'
commit
|
commitdiff
|
tree
2010-01-22
J
uni
o
C Ha
m
ano
ignore duplicated slashes in
m
ake_relative_
p
ath()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Junio C Ham
a
no
git-mv: fix moving m
o
re than o
n
e
s
ource to a sin
g
le
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Junio
C Ham
a
no
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-01-22
Junio
C Hamano
merg
e
-
r
e
cursive: do
n
ot r
e
turn NULL
only to cau
s
e
segfault
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
F
ix
"
log
-
-oneline"
not to sh
o
w notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
conflict-marker
-
s
i
ze:
a
dd
t
est and
docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C
H
a
mano
Update draft release notes
to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
n
o
Merge branch 'bw/cv
s
import'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
e
rge b
r
a
n
ch
'
j
c/checkou
t
-merge-base
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch
'ag/pat
c
h
-
head
e
r-verify'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C
H
amano
Mer
g
e branch 'jc/conflict
-
marker
-
size'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
no
Merge
b
ranch 'ag/ma
i
nt-
a
pply-too-l
a
rge-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
aman
o
Merge branch
'ap/m
e
r
g
e-bac
k
end-opts'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Ham
a
no
M
e
rge bran
c
h 'n
d
/status-partial-refre
s
h'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hamano
Merge r
e
m
o
te branch
'
remot
e
s
/
t
ra
s
t
-doc/fo
r
-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hamano
Merge branch 'jh/notes
'
(
e
arly par
t
)
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Ha
m
a
n
o
Mer
g
e bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hama
n
o
Me
r
ge branch 'jc
/
maint
-
refre
s
h-
i
ndex-is-op
t
i
o
nal-fo
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hamano
Fi
x
"log" family not to be too a
g
r
e
ssiv
e
about showing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
ama
n
o
Merge b
r
a
nch 'rr/cor
e
-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
amano
Merge
b
r
anch 'jc/cache-unm
e
rge'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hama
n
o
M
e
rge br
a
nch 'js/exec-error-report'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
M
e
rge bra
n
ch 'jc/ls-files-
i
gn
o
red-
p
aths
p
ec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge
b
ran
c
h 'jc/gr
e
p-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
n
o
Merge branch 'jc/ma
i
nt-
s
trbuf-add-fix-do
u
bling'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C Hamano
Merge branch 'mm/confli
c
t-advic
e
'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
Hamano
Mer
g
e branc
h
'da/difftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'
mh/rebase
-
fixup'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merg
e
branch 'ns/
r
ebas
e
-auto-sq
u
ash'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
ranch 'mh/rebase-
f
ixup'
(ea
r
ly part)
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Haman
o
M
e
rge bra
n
ch 'il/pus
h
-se
t
-upstre
a
m'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge branch 'jk/warn-author-co
m
mitter-after-commit'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jc/iden
t
'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C H
a
mano
Mer
g
e
br
a
nc
h
'tr/http
-
p
u
sh-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
nch 'bk/fix-relative-git
d
ir-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
m
ano
Merge branch 's
d
/cd-p
-
show-
t
oplevel'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
m
ano
Mer
g
e branch 'jc/symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
m
a
no
date
.
c: mark file-local
function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Haman
o
Sync with 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C H
a
mano
Git
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Haman
o
Mer
g
e branch 'bg/maint-
r
emote-u
p
date-
d
efault'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Haman
o
Merge
branch 'sb/maint
-
octop
u
s' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
ranch 'bg/maint-add-all-doc' into
m
a
in
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge branch 'maint-1
.
6
.
5' into main
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
man
o
Git 1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge bran
c
h 'jk/maint-1
.
6
.
5-reset-
h
ard' into mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C H
a
mano
Merg
e
b
ranch 'tr/
m
ain
t
-1
.
6
.
5
-
b
a
sh-prompt-s
h
o
w-s
u
bmodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branc
h
'dp/maint-1
.
6
.
5-fast-im
p
o
r
t-non-commi
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C H
a
mano
Me
r
g
e bra
n
ch 'jm/maint-1
.
6
.
5-grep
-
NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
T
e
ach @{upstream
}
syntax to strbuf_branchanme()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
mano
t150
6
:
more test for
@{
u
pstream} s
y
ntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
F
ix "
c
heckout
A
.
.
.
" synonym
f
or "checkou
t
A
.
.
.
HEAD
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
st
a
t
u
s
: don't require t
h
e
r
eposito
r
y
to be
wr
i
table
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merg
e
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
a
ma
n
o
Merge branch 'maint-
1
.
6
.
4' i
n
t
o
maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
rge branch 'maint
-
1
.
6
.
3' into mai
n
t-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
a
mano
M
erge b
r
anch 'maint-1
.
6
.
2' into
mai
n
t-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge c
o
m
m
i
t 'v1
.
6
.
4
.
4-8-g8de6518' in
t
o
m
aint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Fi
x
mis-b
a
ckpor
t
of t7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Update draft
r
e
l
ease
not
e
s
to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
erge b
r
a
nc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio
C Hamano
Update dr
a
ft re
l
eas
e
notes to
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
i
o C Hamano
Merge
b
ranch '
d
p
/
maint-1
.
6
.
5-f
a
st-im
p
o
r
t-n
o
n-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
i
o
C Hama
n
o
Mer
g
e
branch 'j
c
/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'pc/uninteresting-su
b
module-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Mer
g
e
b
ra
n
ch 'nd/include-term
i
o
s-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
J
unio
C Hamano
Merge branch 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
rge branch '
j
m/maint-1
.
6
.
5-grep-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio
C
H
am
a
no
s
y
m
l
inks
.
c: remove unu
s
e
d
f
unctions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
obje
c
t
.
c: remove unused f
u
n
c
t
i
ons
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Hama
n
o
Document t
h
at merge strategies ca
n
now
take their own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Make "subt
r
ee" part more orthogo
n
al
t
o th
e
rest of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
p
u
ll: Fix parsing o
f
-X<o
p
tio
n
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
mano
Update dra
f
t releas
e
not
e
s to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio
C
Hamano
Merge
branch 'tc/test-locate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
J
unio C
Hamano
Merge b
r
anch 'j
h
/
commi
t
-status
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
M
e
rge branch 'jn/ma
k
efile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
Merge branc
h
'
jc/
m
aint-1
.
6
.
1
-ch
e
ckout-m-custom-
m
e
rge'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Merge branch 'tc/clone-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
Merge branch 't
c
/smart-htt
p
-rest
r
ict'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C
Hama
n
o
Merge
br
a
nch
'
jk/run-command-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge bra
n
c
h
'sr/gfi-opt
i
ons'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Update COPYING with GPLv2
w
ith new FSF address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
use
r
_i
d
ent_s
u
ff
i
ciently
_
giv
e
n(): refac
t
or the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
H
aman
o
us
e
r_ident_
s
ufficiently_given(): refactor the l
o
gic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
rerere: honor confl
i
ct-mark
e
r-size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
r
erer
e
: prepare for customizabl
e
conflict marker length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
commit
.
c::print_
s
ummary: do not re
l
e
a
se the
format
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C H
a
mano
c
onf
l
ict-mar
k
er-size
:
new
a
ttribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
rerere: use
ll_merge() instead of u
s
in
g
xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C Hama
n
o
merge-tre
e
: use ll_merge() not xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next