repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Make test case numbers unique
2010-01-21
J
u
nio C Hamano
conflict-marker
-
size: add t
e
st and docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
m
a
n
o
U
p
date dr
a
ft release notes
to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io
C
Hamano
Merge branch 'b
w
/cvs
i
m
port
'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hamano
Merge bra
n
ch 'jc/checkout-m
e
r
g
e-b
a
se'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hamano
Me
r
ge branch
'ag/p
a
tch-header-
v
erify'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C H
a
mano
M
e
rge bran
c
h 'jc/
c
onflict-m
a
rker
-
si
z
e'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hamano
Merge b
r
anch 'ag/maint-appl
y
-too
-
large-p
'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Merge
branch 'a
p
/merge
-
bac
k
end-o
p
t
s
'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Ha
m
ano
Merg
e
branc
h
'nd/status-
p
a
rtial-refre
s
h'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
erge remote branch 'remotes
/
trast-doc/f
o
r-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
erge branch
'jh
/
notes
'
(earl
y
par
t
)
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch
'
jc/maint-refr
e
sh-inde
x
-
is-o
p
t
i
o
n
al-fo
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
M
e
rge bra
n
ch 'rr/core-tutori
a
l'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
m
a
no
M
erge branch '
j
c/cach
e
-
unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Ham
a
no
Merge
br
a
nch
'js/exec-e
r
ror-report'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branch
'jc
/
ls-
f
iles
-
ignored-pa
t
hspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jc
/
grep-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
a
no
M
e
rge b
r
anch
'
jc/
m
a
i
nt-strbuf-add-f
i
x-doubling'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge branch 'mm/confl
i
c
t-advice
'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ham
a
n
o
Mer
g
e
b
ranch 'da/d
i
fftool'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hama
n
o
Merge b
r
anch
'mh/rebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge branch 'ns/reb
a
se-auto-squash'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
M
e
rge
branc
h
'mh/rebas
e
-fixup' (e
a
rly part
)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bra
n
ch '
i
l
/push-set-up
s
tream'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
n
c
h
'jk/warn-author-
c
o
mmitt
e
r-afte
r
-commit'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
M
e
r
g
e
branch 'jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rg
e
branch 'tr/http-push-r
e
f-
s
t
a
tu
s
'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C H
a
mano
Merge branch 'b
k
/
f
i
x
-re
l
ati
v
e-git
d
ir-
f
ile'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C
Hamano
Merge branch 'sd/cd-p-show-top
l
evel'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hama
n
o
Merge
br
a
n
c
h
'j
c
/symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C H
a
m
ano
d
a
te
.
c: mark file-local fu
n
ction stati
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Sync with 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Git 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge b
r
a
nch 'b
g
/maint
-
remo
t
e-update-default' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'sb/
m
ai
n
t-
o
ctopus
'
in
t
o maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'bg/maint
-
ad
d
-
all-
d
oc' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge branch
'maint-1
.
6
.
5
'
in
t
o m
a
int
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Ha
m
ano
G
it
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
nch 'jk/maint-1
.
6
.
5-reset-
h
ard' i
n
to
m
ain
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Ha
m
ano
Merge bran
c
h
'
tr/ma
i
nt-1
.
6
.
5-bash-prompt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e branch 'dp/maint-1
.
6
.
5-fast-import
-
non-c
o
mmit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
r
anch 'jm/maint-1
.
6
.
5-
g
r
ep-NUL-
t
ermina
t
e' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Fix "checkout A
.
.
.
" synony
m
for "chec
k
out A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
status
:
don
'
t require the rep
o
sitory
to be wr
i
table
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
m
a
no
Me
r
g
e
branch 'maint-1
.
6
.
4'
i
n
to maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Merge b
r
anch
'maint-1
.
6
.
3' int
o
m
aint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
M
e
rge bran
c
h 'maint-1
.
6
.
2' into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Ham
a
no
M
e
rge commi
t
'v
1
.
6
.
4
.
4-
8
-g8de6518' into maint-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Fix mis-backport of
t
7
0
02
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Update draft release
n
ot
e
s
to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Upd
a
te
d
r
aft re
l
ease notes to
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Merge branch 'dp/ma
i
n
t
-
1
.
6
.
5-fas
t
-import-n
o
n-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
unio C
H
a
ma
n
o
M
e
r
ge branc
h
'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Merge branch
'
pc/uninteresting-su
b
module-dis
a
p
p
ear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C
Hamano
M
e
rge b
r
anch 'nd/inc
l
u
de-te
r
mios-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
J
unio C
H
amano
Merg
e
b
ran
c
h 'js
/
w
i
ndows'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merge branch 'j
m
/maint-
1
.
6
.
5-g
r
e
p
-N
U
L-te
r
minate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
symlinks
.
c: remo
v
e unused
fu
n
ctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Hama
n
o
object
.
c: remove
u
nused funct
i
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hama
n
o
Document that
m
erge strat
e
gie
s
ca
n
no
w
take their own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Make "subtre
e
" part more ort
h
o
gonal
t
o the rest o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C
H
amano
pu
l
l: F
i
x p
a
r
s
ing
of -X<optio
n
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Update draft rel
e
ase no
t
es 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-locate-httpd
'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
M
e
rge
br
a
nch
'jh/commit-
s
tatu
s
'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C Haman
o
Merge branc
h
'jn/makefil
e
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Me
r
ge bran
c
h
'jc/maint-1
.
6
.
1
-
ch
e
ckou
t
-m-custo
m
-
m
e
r
ge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'tc/clone
-
v-progres
s
'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C
Hamano
Merge branch 'tc/smart-http-res
t
rict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
M
erge branch 'jk/run-command
-
use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Me
r
ge
b
ranch 'sr
/
gfi-o
p
t
i
ons'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
Update COPYI
N
G
with GPLv2 wi
t
h new FS
F
add
r
e
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
user_ident_suffi
c
ie
n
tly
_
given(): refa
c
tor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C
Hamano
user_iden
t
_su
f
ficient
l
y_g
i
v
e
n
(): refactor the log
i
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
r
erer
e
: hon
o
r
conflic
t
-marker-size attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
rere
r
e: prepare for customizabl
e
conflic
t
mark
e
r
length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
a
n
o
commit
.
c::prin
t
_summar
y
: do not releas
e
the
format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io
C
Hamano
conflict-marker-size:
n
ew attribu
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
H
aman
o
re
r
ere: use ll_merge() instea
d
of using xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
me
r
ge-
t
r
ee: us
e
l
l
_me
r
ge() not
x
dl_me
r
ge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge(): allow passi
n
g down marker
_
size in xmp
a
ram_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
x
d
l
_
merge(): intr
o
duce xm
p
aram_t for mer
g
e spe
c
ific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
gi
t
_
a
ttr(): fix function s
i
gnature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
e
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'cc/r
e
set
-
more'
commit
|
commitdiff
|
tree
2010-01-15
Junio C Ham
a
n
o
g
rep
--no-index
:
a
llow
us
e
of "git grep" o
u
tsi
d
e
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Juni
o
C Hamano
grep: prep
a
r
e to run outside of
a w
o
rk
tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
unio C Haman
o
M
erge
b
ranch 'jc/ch
e
ckout-
m
e
r
ge-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ham
a
no
Merge
branch '
r
s/maint-archive-match-pathspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge
b
ranch
'il/vcs-he
l
pe
r
'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
s
trbuf_addbuf(): all
o
w
p
a
ssing the 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/
r
eset-more'
commit
|
commitdiff
|
tree
2010-01-13
J
unio C Hamano
Merge
branch 'nd/sparse'
commit
|
commitdiff
|
tree
2010-01-13
J
un
i
o C Ham
a
n
o
t7
5
02: t
e
st c
o
mmit
.
status, --status and --
n
o-stat
u
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
unio C Ha
m
ano
grep: r
i
p o
u
t
p
ess
i
mization to use fixmatch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C Hamano
g
r
ep: rip out support for external
g
rep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Ju
n
i
o
C Ham
a
no
M
erge b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
next