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-tree: remove unnecessary call of git_extract_argv0_path
2010-01-22
Junio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-22
J
u
nio C Hama
n
o
m
e
rge
-
recu
r
sive: do not
r
eturn NULL
only to cause segfault
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
H
a
mano
conflict
-
marker-s
i
ze: add test
and
docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Upda
t
e draf
t
release notes
t
o 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge
b
ranch 'bw/cvsimport'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
Merge
branch '
j
c
/
che
c
kou
t
-
merge-base'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ha
m
ano
Merge
b
ranch 'ag/patch-h
e
ader-verify'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hamano
Merge
branch
'jc/conflict-marker-si
z
e'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
M
erge
b
r
a
n
c
h
'
ag/m
a
int-appl
y
-too
-
la
r
ge-p'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C
H
amano
Merge branch 'ap/merge-backend-opts'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C
Haman
o
Merge b
r
anch 'nd/s
t
atus-partia
l
-
refresh'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Merge remote br
a
nch 'remo
t
es/trast-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C H
a
m
ano
M
e
rge branch 'jh/notes' (
e
arly part)
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
Me
r
ge
b
ranc
h
'maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Ha
m
a
n
o
M
er
g
e
b
ranch
'
jc/maint-refresh-index-is
-
op
t
ional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge branc
h
'
rr/core
-
tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hama
n
o
Me
r
ge
bra
n
ch 'jc
/
ca
c
h
e
-
unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Haman
o
Merge branch 'js/exec-error-report'
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C
Hamano
Merge branch 'jc/ls-fi
l
e
s
-ignored-pat
h
s
p
ec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
n
c
h 'jc/grep-loo
k
a
head'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bra
n
ch 'jc/main
t
-strbuf-add-fix
-
d
o
ubling'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
Hamano
Merge branch
'
mm/conflict-advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
branch 'da/difftoo
l
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
aman
o
Merge branch 'mh/reba
s
e-
f
i
x
up
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge branch 'n
s
/reb
a
s
e
-auto-squash'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
a
no
Me
r
g
e
branch 'mh/reb
a
se-f
i
xu
p
' (
e
arly part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
m
an
o
Merge branch 'il/push-set-up
s
t
ream'
commit
|
commitdiff
|
tree
2010-01-20
J
u
ni
o
C Hamano
Merge branch
'jk/warn-author-
c
ommitter-after-commit'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C H
a
ma
n
o
Me
r
ge branch
'
jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'tr/ht
t
p-push-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o C Hamano
Merge bra
n
ch 'bk/fi
x
-relat
i
ve-gitdi
r
-
file'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Ha
m
a
no
M
e
rge branc
h
'
s
d/cd-p-show-
t
o
p
leve
l
'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
Hamano
Me
r
ge branch
'jc/sy
m
bol-st
a
tic'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
d
a
t
e
.
c: mark file-local func
t
ion static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
S
y
nc with
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Gi
t
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge br
a
nch '
b
g/maint
-
remote-update-defau
l
t' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C Haman
o
Me
r
ge br
a
n
ch
'
sb/maint-octopus' into
maint
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C Hamano
Merge b
r
anch 'b
g
/maint-add-all-doc' into maint
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge branch 'maint-1
.
6
.
5' into maint
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
J
unio C Ham
a
no
Merge br
a
nch 'jk/maint-1
.
6
.
5-reset-hard'
i
nto
m
aint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Ha
m
ano
Merge
b
ranch
'tr
/
maint-1
.
6
.
5-bash-pro
m
pt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge
branch 'dp/maint
-
1
.
6
.
5-fa
s
t
-import-non-com
m
it
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
m
ano
Merge branch 'jm/maint-1
.
6
.
5-grep-NUL-ter
m
inate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Fix "checkout A
.
.
.
"
s
ynonym for "
c
heckou
t
A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Ham
a
no
st
a
tus: don't require the repository to be writable
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
Juni
o
C Ham
a
no
M
e
rge branch
'
maint-1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
branch 'm
a
i
n
t-1
.
6
.
3'
in
t
o mai
n
t-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Merge
branch 'm
a
i
nt-1
.
6
.
2
' into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge c
o
m
mit 'v1
.
6
.
4
.
4-8-g8de6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C
H
am
a
no
Fix 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
m
ano
Up
d
ate
d
raft rel
e
ase
n
o
tes
t
o 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C H
a
mano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Update draft
release not
e
s
to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Merge
b
ran
c
h 'dp
/
maint-1
.
6
.
5-fast-i
m
port-no
n
-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio
C Hamano
Merge branch 'jc
/
rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Me
r
ge b
r
anch
'pc/unintere
s
ting-submodule-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
io
C
H
a
mano
Merge bran
c
h
'
n
d/incl
u
de
-
term
i
os-
f
o
r-os
o
l
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
rge bra
n
ch 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
am
a
no
Me
r
ge bra
n
ch '
j
m/maint-1
.
6
.
5-grep-NUL
-
terminate
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C
H
amano
s
y
ml
i
nks
.
c
:
rem
o
ve unused f
u
nctio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
H
amano
ob
j
ect
.
c: remove unused
func
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
aman
o
Document
that merge stra
t
egies can now take the
i
r own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Make "subtree"
p
art more o
r
thogonal to
t
he r
e
st of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
pu
l
l:
F
ix pars
i
ng of -X<o
p
tion>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Update
draft release notes t
o
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C
Haman
o
Merge
br
a
nch 't
c
/test
-
locate-http
d
'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge bra
n
c
h
'
jh/
c
ommit
-
status'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C H
a
mano
Merge bra
n
ch 'jn
/
makefil
e
'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C Hamano
Mer
g
e branch 'j
c
/maint-1
.
6
.
1
-che
c
kou
t
-m-custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch
'
tc/clone-v-pr
o
gress'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o
C Hama
n
o
Merge branch 'tc/s
m
art-h
t
tp-rest
r
ic
t
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'jk
/
r
un-comma
n
d
-use-
s
hell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 's
r
/
g
fi-o
p
tions'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Update COPYING
with G
P
Lv2 with
ne
w
FSF address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
user_ident_suff
i
ciently_given(): refa
c
tor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C H
a
mano
user_iden
t
_
sufficiently_giv
e
n(): refactor t
h
e logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o C Hamano
rerere: honor conflict-marker-size attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: prepar
e
fo
r
customizable c
o
nflict marker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C
H
amano
commit
.
c:
:
p
rint_s
u
m
mary: do not release the format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Ha
m
ano
conflict-mar
k
er-
s
i
z
e: new attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
n
o
rerere: u
s
e ll_m
e
rge() i
n
stead of using xdl_merg
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
m
erge-tree: u
s
e ll_merge() n
o
t
xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
xdl_merge(
)
:
a
llow p
a
ssing dow
n
marker_size in xmp
a
ram_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
xdl
_
mer
g
e(
)
: int
r
o
d
uce
x
m
p
aram_t for
mer
g
e specifi
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
git_attr(): fix
f
un
c
tion
s
ignature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
M
e
r
ge branch 'cc/re
s
e
t-more
'
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hama
n
o
gre
p
-
-no-inde
x
: allow use
of "git grep" outside a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Jun
i
o C Ham
a
no
grep: prepare to r
u
n
o
utside of a wor
k
tr
e
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge
branch 'j
c
/ch
e
c
k
out
-
merge-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch 'rs
/
maint-a
r
chi
v
e-mat
c
h-pathspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Haman
o
Merge
b
ranch 'il/vcs-he
l
p
e
r'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
strb
u
f
_
addb
u
f(): allow passing th
e
same buf
to dst
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Hamano
Merge branch 'cc/reset-mor
e
'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch '
n
d/sparse'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
amano
t7502: t
e
st
c
om
m
it
.
status, --statu
s
and --no-
s
tatus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
unio C Hamano
grep: r
i
p out pessimization to use fixmatch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next