repo.or.cz
/
git
/
jrn.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/conflict-marker-size'
2010-01-21
Junio
C
Ham
a
no
Merge branch 'jc/confl
i
ct-ma
r
ker-siz
e
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge bra
n
c
h
'a
g
/maint
-
apply-to
o
-large-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Merge b
r
anc
h
'ap/merge-backend-
o
p
t
s'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C
Hamano
Merge branch 'n
d
/sta
t
us-par
t
ial-refresh
'
commit
|
commitdiff
|
tree
2010-01-21
J
unio
C Hamano
M
erge
remo
t
e branch
'
r
emotes/trast-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C H
a
mano
Merge b
r
anch 'jh/notes' (early part)
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hamano
M
e
rge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C
Hama
n
o
Merge b
r
anch 'jc/maint-refresh-
i
nde
x
-is-optional-
f
or
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge branch 'rr/c
o
re-tut
o
rial'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge branch '
j
c
/cache-unm
e
rg
e
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C H
a
m
ano
Merg
e
branch '
j
s/exec-er
r
or-rep
o
rt'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hama
n
o
Merge
b
ranch 'j
c
/ls-files-i
g
nor
e
d-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Ha
m
ano
Merge br
a
n
c
h 'jc/grep-lookahe
a
d'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o C Hamano
Merge branch
'
jc/
m
aint-str
b
uf-add-fix
-
doub
l
ing'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
n
c
h 'mm/conf
l
ict-advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge branc
h
'
d
a/diffto
o
l'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o
C Hamano
Merge bra
n
ch 'mh/reba
s
e-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
H
amano
Merge branch
'ns/re
b
ase-a
u
to-sq
u
ash'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hama
n
o
Merg
e
br
a
n
ch 'mh/rebase-fixup' (early part
)
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
M
erge
branch 'il/push-set-ups
t
ream
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Mer
g
e branch
'jk/
w
arn-author-commit
t
er-after-com
m
it'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e branc
h
'jc
/
ident'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C
H
aman
o
Merge br
a
nch 'tr/
h
t
t
p-push-ref-stat
u
s'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Haman
o
Merge
b
r
a
nch 'bk/fix
-
relative-gitdir-file
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
am
a
no
Me
r
ge branch '
s
d/cd-p-show-toplev
e
l'
commit
|
commitdiff
|
tree
2010-01-20
J
uni
o
C Hamano
Merge
b
r
a
nc
h
'jc/symbo
l
-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
da
t
e
.
c
:
m
a
rk file-local functi
o
n static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Ha
m
ano
S
ync 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
H
am
a
no
Merg
e
b
ra
n
ch 'bg/maint-
r
emote-upd
a
te-default' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C Ham
a
no
M
erge b
r
anch 'sb
/
maint-oc
t
opus' into
mai
n
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge br
a
nch 'bg/main
t
-add-all-do
c
' i
n
to
m
aint
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hama
n
o
M
e
rge branch 'ma
i
nt-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Gi
t
1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o C Hamano
Merge
b
ranc
h
'
jk/mai
n
t-1
.
6
.
5-reset-hard' into main
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
H
amano
Merge
b
ranc
h
't
r
/m
a
i
nt-1
.
6
.
5-bash-prompt-show-
s
u
bmodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge branch
'dp/mai
n
t-1
.
6
.
5-fas
t
-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merge bran
c
h 'jm/m
a
int-1
.
6
.
5-gre
p
-NUL
-
terminate' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C
Ham
a
no
status: do
n
't requir
e
the rep
o
sitor
y
t
o
be writa
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Haman
o
Merge branc
h
'maint-1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
i
o C Hama
n
o
Merge branch 'maint-1
.
6
.
3' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
M
erge b
r
anc
h
'
m
a
i
nt-1
.
6
.
2' into
m
aint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Me
r
ge
c
ommit 'v1
.
6
.
4
.
4
-
8-g8de65
1
8' into maint-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
F
i
x
mis-ba
c
kport of t700
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o
C Ham
a
no
U
p
d
a
t
e
draft release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
a
no
U
p
d
a
t
e
draft
rele
a
se no
t
es to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
un
i
o
C
H
a
mano
M
erge
b
ranch 'dp/maint-1
.
6
.
5-fast-im
p
ort
-
non-co
m
mit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
i
o
C Ha
m
ano
Merge br
a
n
c
h 'jc
/
rerere'
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
M
e
r
ge branch 'pc/uninteresting-sub
m
o
d
u
le-
d
is
a
p
p
ear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge b
r
anch 'nd/incl
u
de-termio
s
-
f
or
-
oso
l
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Mer
g
e
b
ran
c
h '
j
s
/
window
s
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
a
n
o
Merge bra
n
c
h
'jm/maint-1
.
6
.
5-grep-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
symlinks
.
c: remove
u
nused function
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
o
bje
c
t
.
c
:
r
e
m
o
ve u
n
used fun
c
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Haman
o
D
ocum
e
nt
t
hat merge strategies can
n
ow take their
o
wn
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
Make "subt
r
ee" part mor
e
o
rthogonal
t
o
the rest
of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
pull: Fi
x
parsing of -X
<
op
t
ion>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Hamano
Up
d
ate
d
raft rele
a
se note
s
t
o 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Haman
o
Merg
e
b
r
a
nch 'tc/test-locate
-
httpd'
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Hamano
Me
r
ge branch 'j
h
/comm
i
t
-stat
u
s'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
Merge
b
r
anch '
j
n/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
Merge branch
'jc/mai
n
t-1
.
6
.
1-checkout-m-custom-me
r
ge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
Merge branch 'tc/clon
e
-v-progr
e
ss'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C
Haman
o
M
erge branch 'tc/smart-http-restr
i
ct'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
ano
M
e
rge branch '
j
k/run-comma
n
d-u
s
e-shell'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hama
n
o
Merge branc
h
'sr/gf
i
-options'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
U
p
date COPYING with G
P
Lv2 w
i
t
h new FSF
a
d
dres
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
use
r
_ide
n
t_sufficie
n
t
l
y_giv
e
n()
:
refactor
t
he logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
use
r
_ident_s
u
fficiently_given(
)
: refactor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Ham
a
no
rerere: honor con
f
lict-marker-size attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
r
erere:
prep
a
r
e
fo
r
c
usto
m
izable
co
n
flict mark
e
r leng
t
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C H
a
mano
commit
.
c::pri
n
t_summ
a
ry: do not relea
s
e the format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
c
o
nflict-marker-size: new att
r
ibute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
n
o
r
e
rer
e
:
use l
l
_merge() instead of using xdl_mer
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Ham
a
no
merg
e
-tree: use
ll_merge
(
) n
o
t xdl_m
e
rge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
xdl_merge():
allow pas
s
i
ng
d
own 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
(
): introduce xmparam
_
t
f
or merge specif
i
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
g
i
t_attr()
:
f
ix func
t
io
n
s
i
g
n
a
t
ure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hama
n
o
Merge b
r
anch 'm
a
int
'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hama
n
o
Merge b
r
anch 'cc
/
r
eset-more'
commit
|
commitdiff
|
tree
2010-01-15
Junio C
Hamano
grep -
-
no
-
i
ndex: allow use of
"
g
i
t grep" ou
t
si
d
e a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Ham
a
no
grep:
p
r
e
pare to run out
s
ide of a work tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
u
ni
o
C
Hamano
Merge b
r
anch 'jc/checkout-merge-b
a
se'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C
H
amano
Merge branch
'rs/maint-archive-m
a
tc
h
-pathspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ham
a
no
Merge
branc
h
'il/vcs-helper'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C Haman
o
strbuf_addbuf(): allow p
a
ssing the s
a
me buf to
d
st
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Haman
o
Merge branch 'c
c
/
reset-more'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
H
aman
o
Merge branch 'nd/spar
s
e'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
i
o
C Ham
a
no
t7502: test commit
.
status,
-
-s
t
atus
a
nd --
n
o
-
status
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C
Haman
o
g
r
e
p
:
r
i
p
ou
t
pessi
m
i
z
ation to use f
i
xmatch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Haman
o
g
rep: r
i
p out
s
upport for ex
t
e
r
n
al grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
Merge b
r
a
n
c
h '
m
a
int'
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C Hamano
s
t
rbuf
.
c: remov
e
unused func
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
H
am
a
no
s
h
a1_file
.
c: re
m
o
v
e unused function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Juni
o
C
Hamano
ma
i
l
m
ap
.
c: remove unus
e
d function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Ham
a
no
utf8
.
c: mark fil
e
-local function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C Hamano
submod
u
le
.
c: mark file-local function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C Hamano
quot
e
.
c:
mar
k
file-local function
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next