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 'jc/branch-d'
2010-01-23
Junio C Ha
m
ano
Merge branch 'jc/bran
c
h-d'
commit
|
commitdiff
|
tree
2010-01-23
Ju
n
io C Hamano
Merge branch 'il/rev-glo
b
'
commit
|
commitdiff
|
tree
2010-01-23
Juni
o
C Hama
n
o
Mer
g
e
branch
'js/refer-u
p
st
r
eam'
commit
|
commitdiff
|
tree
2010-01-23
Juni
o
C Haman
o
Merge branch 'jl
/
submo
d
ule-diff'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hamano
M
e
rge
b
ranch 'il/
r
e
mote-update
s
'
commit
|
commitdiff
|
tree
2010-01-23
Junio C
Hama
n
o
Merge branch 'i
l
/
b
ra
n
ch-set-upstream'
commit
|
commitdiff
|
tree
2010-01-23
Junio C
H
aman
o
Merge bra
n
ch 'jc/ma
i
nt-li
m
it-note-output'
commit
|
commitdiff
|
tree
2010-01-23
Junio C H
a
ma
n
o
Merge
b
ranch 'nd/ls-f
i
les-sparse
-
fix'
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
git-mv: fix moving more than one source to a single
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Jun
i
o C H
a
mano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-22
Jun
i
o
C Hamano
merge-recursive: do
not
return
NULL only to cause segfa
u
lt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Haman
o
Fix
"
log --oneline"
n
ot t
o
show notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hamano
conflict-marker-size: add test
and do
c
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C
Hamano
Up
d
ate d
r
af
t
release notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Ham
a
no
Merge b
r
anch 'bw/cv
s
import'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Merge bra
n
ch 'jc/ch
e
ckou
t
-mer
g
e
-
base'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
no
M
e
rge branch 'ag/patch-header-verify
'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Ha
m
ano
Merge
b
ranch
'jc/con
f
l
ict-marker-siz
e
'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Ha
m
an
o
Me
r
ge bra
n
ch
'
ag/maint-apply-t
o
o
-
large-p'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hamano
Merge branch 'a
p
/mer
g
e-backend
-
opts'
commit
|
commitdiff
|
tree
2010-01-21
J
unio
C
Hama
n
o
Merge
b
r
a
nch 'nd/st
a
tus-partial-re
f
res
h
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
Merg
e
remote
branch 're
m
o
t
e
s/trast-do
c
/
f
or-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch 'j
h
/
notes' (
e
arly part
)
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Ha
m
a
n
o
Merge br
a
nch '
m
aint
'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Ham
a
n
o
M
erg
e
branch
'
j
c/
m
aint-r
e
fre
s
h
-
i
n
d
ex-
i
s
-opt
i
onal-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
F
ix
"log" family
not to be too agressive about showing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e
b
ranch
'
rr/core-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jc/
c
ache-unmerge
'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
H
amano
Merge branch '
j
s/ex
e
c-e
r
ro
r
-report'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge branch 'jc/ls-files-ignored-p
a
thsp
e
c'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e
b
r
a
n
ch 'jc/grep
-
lookahead'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hama
n
o
Merge branch 'jc/
m
a
int-strbuf
-
a
dd-fi
x
-
d
oubling'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
M
e
r
ge branch 'mm/conflict-advi
c
e'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
M
erge branc
h
'da/diff
t
o
o
l'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bra
n
ch 'mh/rebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
branch '
n
s
/rebase-auto-squash'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ham
a
no
Merge branc
h
'
mh/
r
ebas
e
-fixup' (early part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'il/push-set-upstream'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Haman
o
Merge branch 'jk/warn
-
author-c
o
mmitt
e
r-a
f
ter-commit'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge bra
n
ch '
j
c/
i
dent'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ham
a
no
Merge branch
'tr/ht
t
p-push
-
ref-sta
t
us'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge b
r
anch 'bk/fix-relative-git
d
i
r-file'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Mer
g
e branch 'sd/cd-p-show-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
r
anch 'jc/symbol-static
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
d
a
te
.
c: mar
k
file-local function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio 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
Jun
i
o
C Hamano
Gi
t
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge branch 'bg/main
t
-remote-update-default' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ha
m
ano
M
e
rge
b
r
a
nch 'sb/maint
-
octopus' into
maint
commit
|
commitdiff
|
tree
2010-01-20
J
uni
o
C
Hamano
Merg
e
bra
n
c
h 'bg/maint-add-all-doc' into
m
aint
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge branch 'maint-1
.
6
.
5
'
into maint
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C Ha
m
ano
Git 1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge branch
'
jk
/
maint-1
.
6
.
5-reset-har
d
' into
m
ain
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
Hamano
Merge branch 't
r
/maint-1
.
6
.
5-bash-prompt
-
s
how-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch '
d
p/main
t
-1
.
6
.
5-f
a
st-
i
mport-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge
b
ranch 'jm/mai
n
t-1
.
6
.
5-
g
rep-NUL-te
r
minate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Teach @{upstream} syn
t
a
x
to strbu
f
_br
a
nchanme()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C H
a
mano
t1506: more test for @
{
ups
t
ream} syn
t
ax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Fix "ch
e
ckout A
.
.
.
" synonym for "chec
k
o
u
t A
.
.
.
H
EA
D
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C Hamano
sta
t
us: don't require the reposit
o
ry
t
o
be writable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o
C Hama
n
o
Merge branch 'maint-1
.
6
.
4
' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Ha
m
a
no
Me
r
g
e branch '
m
aint-1
.
6
.
3' i
n
to maint
-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
b
ranch 'm
a
int-
1
.
6
.
2'
into m
a
int-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o
C
Hama
n
o
Mer
g
e commit 'v
1
.
6
.
4
.
4-8-g8de
6
518'
i
nto ma
i
nt-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
F
i
x mis-backport of t7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Ha
m
ano
U
p
date draft r
e
leas
e
n
otes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
ge
b
ranch '
m
a
int'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Update d
r
aft release no
t
es to 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Merge branch 'dp/ma
i
nt-
1
.
6
.
5
-
fas
t
-
import-
n
on-commi
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Merge
branch 'j
c
/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'pc/
u
ninteresting-submodule-d
i
sappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
unio C
Hamano
Merg
e
bra
n
ch
'
n
d
/include-termios-for-os
o
l'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hama
n
o
Merge
b
ranc
h
'
j
s/windows'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
M
erge bran
c
h 'jm/maint-1
.
6
.
5-
g
rep-
N
UL-termina
t
e' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o
C
H
a
mano
s
y
m
l
i
nks
.
c: remove
u
nuse
d
functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
m
a
n
o
object
.
c: remove unused functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
io C Hamano
D
o
cument that merge s
t
r
a
t
egies
c
an now take
t
heir own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
Make "s
u
btree" part m
o
r
e
orthogonal to th
e
re
s
t
o
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
pull
:
Fix pa
r
s
i
ng of -X<op
t
ion>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C
H
amano
Update
draft release
note
s
to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Hama
n
o
Merge bra
n
ch 'tc/test-locate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
M
er
g
e
branch
'jh/commit-sta
t
u
s
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
M
e
rge
b
r
a
n
c
h 'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C H
a
mano
Merge
b
ranc
h
'jc/mai
n
t-1
.
6
.
1-checkout-m-c
u
s
tom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
Merge bran
c
h
'tc/clone-v-prog
r
e
s
s'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch
'
t
c
/smart-http-re
s
t
rict'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Ham
a
no
Mer
g
e
bra
n
ch 'j
k
/ru
n
-command-us
e
-shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
Merge branch 'sr/gfi-o
p
tions'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
Upd
a
te COPYING with
GPLv
2
with n
e
w
F
SF
ad
d
r
ess
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
u
s
e
r
_ide
n
t_su
f
ficiently_given(): refactor the lo
g
ic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
u
ser_ident_suf
f
i
c
iently_gi
v
en(): refact
o
r the
l
ogic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
rere
r
e: hon
o
r co
n
flict-mark
e
r-size
attribut
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: prepa
r
e
for customi
z
able conflict mar
k
er leng
t
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
commit
.
c::print_sum
m
a
ry: do
n
ot rele
a
se th
e
format
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
conflict-marke
r
-
s
i
z
e:
new a
t
tribut
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
a
no
re
r
e
re: use ll_mer
g
e() instead of using x
d
l_
m
erge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
m
e
rge-tree: use ll_merge() n
o
t
xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_m
e
rge(): allow
p
ass
i
ng
down marker_s
i
ze in xmparam_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
xdl_me
r
ge(
)
: introduce xmpa
r
am_
t
f
or merge s
p
ecific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next