repo.or.cz
/
git
/
jnareb-git.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
J
u
nio
C Hamano
co
n
flict-marke
r
-
s
i
ze: add test
a
nd docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
U
p
date draft
r
elease notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Me
r
ge branc
h
'
bw/cvsimport'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hamano
Merg
e
b
ranch
'jc/checkout-merge-
b
ase'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hama
n
o
Merge b
r
anch 'ag/patch-header-verify'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Merge bran
c
h 'jc/confli
c
t-mark
e
r-size'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Ham
a
no
Merge branch
'
ag/maint-apply
-
too-large-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge bra
n
ch 'ap/merge-backend-opts'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io
C Hamano
Merge bran
c
h
'
n
d/status-pa
r
t
ial-refres
h
'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio
C
H
amano
Merge re
m
ote br
a
nch 'remotes/trast-do
c
/
for-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Ha
m
a
no
M
erge branch 'jh/notes' (early pa
r
t)
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge
b
r
anch 'maint
'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
Merge branch 'jc/maint
-
refresh-i
n
de
x
-
i
s-option
a
l-f
o
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C Ham
a
no
Merg
e
br
a
nc
h
'r
r
/c
o
re-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Ham
a
no
Me
r
ge branch 'jc/cache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'js/exec-er
r
o
r
-report'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o C Haman
o
M
erge branch 'jc/ls-fil
e
s
-
i
gnored
-
pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge br
a
nch '
j
c/grep-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge branch 'jc
/
main
t
-strbuf
-
add-fi
x
-d
o
ubling'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'mm/confl
i
ct-adv
i
ce'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'd
a
/difftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'
mh/rebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
M
e
rge
branc
h
'ns/rebase-aut
o
-s
q
u
a
sh'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge
b
ran
c
h '
m
h/reb
a
se-fixup'
(
ea
r
ly p
a
rt)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge branch 'il/push-set-
u
ps
t
ream'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Ham
a
no
Mer
g
e branch 'jk
/
wa
r
n-author-commit
t
er-after-c
o
mmit'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge bra
n
ch
'
jc/
i
dent'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge branch 'tr/htt
p
-push-ref
-
status'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
Ha
m
ano
Merge branch
'
b
k/fix-rela
t
ive-gitdir-
f
i
l
e'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge b
r
anch
'sd/cd
-
p-s
h
o
w
-tople
v
e
l
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge branch 'jc/s
y
mbol-static'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o C Hamano
dat
e
.
c:
m
ark file-local fun
c
tion stat
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hama
n
o
Sync
w
ith 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C
Hamano
G
it 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merg
e
b
r
anch
'
b
g/maint-remote-upd
a
te-default' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
am
a
no
Me
r
ge branch 'sb
/
maint-octopu
s
'
into mai
n
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
m
a
no
Merge bra
n
ch
'
bg/maint-add-all-
d
o
c' int
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Mer
g
e bra
n
ch 'm
a
in
t
-1
.
6
.
5' into m
a
in
t
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hama
n
o
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
r
a
nc
h
'
j
k/ma
i
nt-1
.
6
.
5
-
r
e
set-hard'
in
t
o mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge
b
r
anch 'tr/maint-1
.
6
.
5-bash-prompt-show
-
submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bra
n
ch 'dp
/
mai
n
t
-1
.
6
.
5-fast
-
im
p
ort-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge
branch 'j
m
/maint-1
.
6
.
5-grep-NUL-terminate'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o C Hamano
Fix "checkou
t
A
.
.
.
"
synonym for "checkout
A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
s
tatus
:
don't requ
i
r
e
t
h
e r
e
p
o
sitor
y
to be writable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C Hamano
Merge branc
h
'
maint
'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Haman
o
Merge branch 'maint-1
.
6
.
4' into maint
-
1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Merge
br
a
nch 'maint-1
.
6
.
3' int
o
maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
uni
o
C Ham
a
no
Merge branch 'maint-1
.
6
.
2
'
into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
an
o
M
e
rge commit 'v1
.
6
.
4
.
4-
8
-
g8de6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
n
o
Fix mis-backport of t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
U
pdate dra
f
t
r
elease notes
to
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Mer
g
e
branch 'm
a
i
nt'
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Update
d
ra
f
t rel
e
as
e
notes 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/m
a
int-1
.
6
.
5-fa
s
t-import-n
o
n-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Merge
b
ranch 'jc/re
r
ere'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio
C
Ham
a
no
Merg
e
bra
n
c
h '
p
c
/
unint
e
resting-submo
d
ul
e
-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hama
n
o
M
e
rge branch 'nd/include-ter
m
ios
-
for-osol
'
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Ha
m
ano
Mer
g
e bran
c
h 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
m
a
n
o
Merge bra
n
ch
'
jm/
m
ai
n
t-1
.
6
.
5-gr
e
p-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C
Hamano
s
ymlink
s
.
c: r
e
m
o
ve unuse
d
functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Ha
m
ano
object
.
c: remove unused func
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Hamano
Document that
m
erge strategies can now take their
o
w
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Ha
m
ano
Mak
e
"subtre
e
" part
m
ore ortho
g
o
nal to
the rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
io C Hamano
p
ull: Fix pars
i
ng of -X<opt
i
on>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
ano
Update dr
a
f
t
r
elease notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge
branch 'tc/test-
l
o
c
ate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Me
r
ge b
r
anch 'jh/co
m
m
it-
s
tatus'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
Merge b
r
anch
'
j
n/makef
i
l
e
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
erge branch 'jc
/
maint-1
.
6
.
1-ch
e
ckout-m-
c
ustom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Haman
o
Mer
g
e branch 't
c
/cl
o
ne-v-progr
e
ss'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge
branch
'tc/smart-
h
t
tp-res
t
rict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
Merg
e
branch 'jk/run
-
comma
n
d-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
M
e
rge b
r
anch
'sr/gfi-opti
o
n
s
'
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C
Hamano
Update
C
OPYIN
G
with GPLv2 with new F
S
F ad
d
ress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_ide
n
t_sufficiently_given():
r
efactor th
e
lo
g
ic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
user
_
iden
t
_sufficiently_given(): refactor the
l
og
i
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
rer
e
re: ho
n
or conflict-m
a
r
ker-size
a
t
t
ribu
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C
Hamano
rerere: prepar
e
for cu
s
tom
i
zable conflict marker leng
t
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
commit
.
c::print_summar
y
: do
no
t
r
e
lease the
f
ormat
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io
C
Hamano
con
f
li
c
t-mar
k
er-s
i
ze: new att
r
i
bute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
r
ere
r
e: use ll_merge() ins
t
ead of using xdl_
m
erge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
merg
e
-tree: use ll_merg
e
() not xdl_mer
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C Hamano
xd
l
_merge()
:
al
l
ow passing down marker_size
in xmparam_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C H
a
ma
n
o
xdl_merge():
introduce xmparam_t for merge spec
i
fi
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
git_attr
(
): fix function sig
n
ature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C
Hama
n
o
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
Merge b
r
anch 'cc
/
reset-mor
e
'
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
grep --no-index: allo
w
u
s
e of "git grep" outs
i
de a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio
C
H
amano
grep: p
r
ep
a
re to run outside of a work
tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
amano
Mer
g
e
b
ran
c
h 'jc/checkout-merge-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
Hamano
Merge branch 'rs/maint
-
archive-mat
c
h-pa
t
hspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
amano
M
e
rge
b
ranch 'il/vcs-helper'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hama
n
o
strbuf_addbuf(): allow passin
g
the same buf to dst
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merg
e
branch
'cc/reset-more'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Hamano
Merg
e
branch 'nd/s
p
arse'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C Hamano
t75
0
2: test commi
t
.
statu
s
, --status and --
n
o
-
status
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Juni
o
C Hamano
grep: rip out pessimiza
t
ion to use fixmatch
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
grep: rip out sup
p
ort for exter
n
al grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C H
a
m
a
no
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
next