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
conflict-marker-size: add test and docs
2010-01-21
Junio C Hamano
conflict-marke
r
-size: add te
s
t and docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
no
Update draft release
n
otes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C
H
a
mano
Merge branch
'
b
w/cvsi
m
port'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
no
Mer
g
e branc
h
'jc/che
c
kout-merge-bas
e
'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
H
ama
n
o
Merge branch
'
ag
/
patch-h
e
ader-veri
f
y'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hamano
Merge branch 'jc/conflict-marke
r
-size'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio
C Ham
a
no
Merge br
a
nch 'ag/mai
n
t-apply-too-large-
p
'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o
C
Ha
m
ano
M
e
r
ge bra
n
ch 'ap/merg
e
-b
a
ckend-
o
pts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ha
m
ano
Merg
e
branch 'nd
/
status-part
i
al-r
e
fresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hamano
Me
r
ge remote branch 'remotes/tras
t
-doc/for
-
n
ext'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch '
j
h/notes' (early part
)
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hamano
M
erge bra
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-01-21
J
unio
C
H
amano
Merge bra
n
ch
'jc/maint-ref
r
esh-index-is-optional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'rr/co
r
e-t
u
torial'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Me
r
ge
b
ranch 'jc/cache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
ranch 'js/exec-err
o
r
-report'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge bra
n
ch 'jc/ls-file
s
-
i
gnored-p
a
thspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge br
a
nch 'jc/grep-l
o
okahead
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
nch 'j
c
/main
t
-strbuf-add-fix-
d
o
u
bling'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Ha
m
ano
Merge bra
n
ch 'mm/conflict-a
d
vice
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
br
a
nch 'da/difftool
'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ham
a
no
Merge branch
'mh/re
b
ase-fi
x
up'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Me
r
ge
branch 'ns/rebas
e
-auto-squash'
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C Hamano
Mer
g
e branch 'mh/rebase-fixup' (early part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge branch 'il/push-set-upstream'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jk/warn-author-comm
i
tter-after
-
com
m
it'
commit
|
commitdiff
|
tree
2010-01-20
J
un
i
o C Hamano
M
e
rge br
a
nc
h
'jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Ha
m
ano
Merge branch 'tr/
h
t
tp-push-r
e
f-st
a
t
us'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hama
n
o
Merge branch 'b
k
/fix-rel
a
tive-gitdir-f
i
le'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Me
r
ge branch 'sd/cd-p-show-t
o
ple
v
e
l
'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merg
e
branch 'jc/symb
o
l-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
dat
e
.
c:
mark file-local
f
unction static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Syn
c
with 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
G
it 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Me
r
g
e branch 'bg/mai
n
t-r
e
mote-update-defa
u
lt' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
ama
n
o
Merge branch 'sb/m
a
i
nt-o
c
topus'
i
nto maint
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
Hamano
M
erge b
r
anch 'bg/maint-add-all-doc' into main
t
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merg
e
branch '
m
a
i
nt
-
1
.
6
.
5' into mai
n
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
H
amano
M
e
rge branch 'jk/maint-1
.
6
.
5-reset-hard' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge branch '
t
r/ma
i
nt-1
.
6
.
5
-
b
a
s
h
-prompt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e
bra
n
ch '
d
p
/
m
ain
t
-
1
.
6
.
5-fast-impor
t
-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge bran
c
h 'jm/maint
-
1
.
6
.
5-grep-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
H
am
a
no
Fix "c
h
e
c
kout A
.
.
.
" synonym f
o
r "checkout A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
statu
s
: don'
t
r
e
quire the
repository to be writab
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
r
g
e b
r
anch 'maint-1
.
6
.
4'
i
nto
maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merg
e
br
a
nch
'
maint-
1
.
6
.
3' i
n
to maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C
Hamano
Merge bran
c
h 'maint-1
.
6
.
2' in
t
o maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Ha
m
ano
Merge commit 'v1
.
6
.
4
.
4-8-
g
8d
e
6518' into main
t
-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C
Ha
m
ano
Fix mis
-
backpo
r
t of t70
0
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Update dr
a
ft release
note
s
to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C
H
amano
Merg
e
branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Update dra
f
t r
e
le
a
se notes to
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
Merge branc
h
'dp/maint-1
.
6
.
5-fast-im
p
ort-non-co
m
mit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch '
j
c
/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
m
a
no
M
e
rge branch 'pc/uninteresting-submodule-disa
p
p
e
ar
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o
C Hamano
M
e
rge branch 'n
d
/in
c
lude
-
termios-for-o
s
ol
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Merge b
r
anch 'js/windo
w
s'
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
M
erge
b
ra
n
ch 'jm/maint-1
.
6
.
5-gre
p
-NUL-termina
t
e' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
s
y
mli
n
ks
.
c: re
m
ove unused
f
u
nctio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io
C H
a
mano
object
.
c:
remov
e
unu
s
ed
f
u
nctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Haman
o
Doc
u
ment
tha
t
merge
s
t
rategies can now
t
ake
their
o
wn
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Make "sub
t
ree
"
part more ortho
g
onal to the rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
p
u
ll: Fix
p
arsing
o
f -X<opt
i
on>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
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
H
a
man
o
Merge branch 'tc/te
s
t-locate-
h
t
tp
d
'
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Ha
m
ano
Merge branch 'jh/commi
t
-status'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C
Hamano
Merge branch 'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
ano
Merge branch
'
jc
/
maint-1
.
6
.
1-ch
e
ckout-m-custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
Merge branc
h
'tc/c
l
one-v-p
r
ogre
s
s'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Haman
o
Merge
b
r
a
n
c
h
'
tc/smart-http-restrict'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C
Ham
a
n
o
Merge branch
'jk
/
run-c
o
mm
a
nd-use
-
shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
e
rge branch 'sr/g
f
i-options'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
Update COPYING with GPLv2 with
n
ew FSF address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C
H
amano
user_ident_
s
ufficiently_given(): refact
o
r t
h
e logi
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
use
r
_iden
t
_suffic
i
ently_given(): refactor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
rerer
e
: honor con
f
lict-ma
r
k
e
r-
s
iz
e
attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere
:
prepare for cus
t
omizable confl
i
ct marker len
g
th
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
commi
t
.
c:
:
prin
t
_summa
r
y:
do
n
ot release the format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C
Hamano
conf
l
ic
t
-
marker-size: new attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere:
u
se
l
l
_
merge() inst
e
ad of usin
g
xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
merg
e
-tree:
u
s
e
l
l_merg
e
() n
o
t xdl_
m
erge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
x
dl_mer
g
e(
)
:
al
l
ow passing d
o
wn marker_siz
e
in
xmparam_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
xdl_merge(): introduc
e
xmparam_
t
for merge specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o
C Hamano
git_
a
ttr(): fix funct
i
on
signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
Mer
g
e bra
n
ch 'cc/re
s
et-more'
commit
|
commitdiff
|
tree
2010-01-15
Junio C Ham
a
no
grep --no
-
index: allow
u
se of "git grep"
outs
i
de a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
J
u
nio
C H
a
mano
g
r
ep: prepar
e
t
o
ru
n
outside of
a work tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merg
e
branch 'jc/checkout-merge-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ham
a
no
Merge br
a
nch
'
r
s
/main
t
-
archi
v
e-match-pathspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
a
mano
Merge b
r
anc
h
'il
/
vcs
-
helper'
commit
|
commitdiff
|
tree
2010-01-13
J
u
n
io C H
a
mano
strbuf_addbuf(): allow passing the same b
u
f to dst
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
i
o C Hamano
Merge branch 'cc/reset-
m
ore'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Hamano
M
erge branch
'
nd/sparse'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ha
m
ano
t
7502: test commit
.
status, --st
a
tu
s
a
nd --no-status
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o
C
H
a
mano
gre
p
:
rip ou
t
pess
i
mization to use fix
m
atc
h
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ha
m
ano
grep: rip ou
t
support
f
or external
grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Ham
a
no
Merge
b
ranch
'mai
n
t'
commit
|
commitdiff
|
tree
next