repo.or.cz
/
alt-git.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
o
hannes Sixt
M
ake test case n
u
mbers uniq
u
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io
C Ha
m
ano
confli
c
t-mark
e
r-s
i
ze:
a
dd te
s
t and
docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C
H
ama
n
o
Update draft release note
s
to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
erge
b
r
a
n
c
h 'bw/cvsimport
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
e
r
ge branc
h
'jc
/
checkout-mer
g
e-base'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
Merge b
r
anch 'ag/patch-h
e
a
der-ve
r
ify'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hamano
M
e
rge
b
ran
c
h 'jc/conflict-marker-
s
i
z
e'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
i
o C Hamano
M
e
rge bran
c
h 'ag/main
t
-
a
p
pl
y
-
too-lar
g
e-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
no
Mer
g
e branch '
a
p/merge-backend-opts
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
M
e
rge
b
ranch 'nd/status-partial-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
e
rge remote branch 'remotes/trast-doc/f
o
r-next'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Ham
a
n
o
Merge branch 'jh/notes' (ea
r
ly part)
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
H
amano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hamano
Merge
branch '
j
c/ma
i
n
t-
r
efresh
-
index-is-optional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Haman
o
Merge bran
c
h 'rr/core
-
tutor
i
al
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge branch
'
jc/ca
c
he-unme
r
g
e
'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
H
amano
Merge branch 'js
/
exec-error-report'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h 'jc/ls-files
-
ignored-pathsp
e
c'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
M
erge branc
h
'
j
c
/
grep-lo
o
kahead
'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ha
m
ano
Mer
g
e
b
ranch 'jc/maint
-
strbuf-add-fix-
d
ou
b
ling'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ham
a
no
Merge branch 'mm/conf
l
ict-advice'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C H
a
m
a
n
o
Merge branch 'd
a
/difftool'
commit
|
commitdiff
|
tree
2010-01-20
J
un
i
o
C
H
a
ma
n
o
Merge
branch 'mh/r
e
b
ase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
H
ama
n
o
Mer
g
e
b
ranch 'ns/rebase-auto-s
q
uas
h
'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
Hamano
Merge b
r
anc
h
'mh/reb
a
se-fixup'
(early part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge branch 'il/push-s
e
t-u
p
stream'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge branch 'j
k
/warn-aut
h
or-committer-afte
r
-comm
i
t'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
g
e
b
ranch 'jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Mer
g
e b
r
anch 'tr/htt
p
-push-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
M
erge branc
h
'bk/fix-relativ
e
-gitdir-file
'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge branc
h
'sd/cd
-
p-show-to
p
level'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Mer
g
e
branc
h
'jc/
s
ymbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
date
.
c:
m
a
r
k file-local
function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o 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
H
amano
Git 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
br
a
n
ch
'bg/maint-remote
-
upda
t
e-default' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C H
a
mano
Merge branch 'sb/mai
n
t-octopus' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
nch 'bg/
m
ain
t
-add-all-doc' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'maint-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Git
1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Hamano
Merge branch '
j
k/maint
-
1
.
6
.
5-re
s
e
t
-hard' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
M
erge branch 'tr/main
t
-1
.
6
.
5-b
a
sh-p
r
ompt-show-submodu
l
e
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Mer
g
e branch 'dp/maint
-
1
.
6
.
5-fast
-
im
p
ort-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C
H
a
mano
Merge
b
ran
c
h 'jm/ma
i
nt-1
.
6
.
5-
g
rep-NUL
-
termi
n
ate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Haman
o
Fix "checkout
A
.
.
.
"
synonym for "checkout 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 repository t
o
be writable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
J
ohannes
Sixt
M
akefile: honor NO_CURL wh
e
n se
t
tin
g
R
EMOTE_CURL_*
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Tarm
i
gan Ca
s
ebo
l
t
ident
.
c: replace fpr
i
ntf with fp
u
t
s
to
suppress compile
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
N
g
u
yễn Thái Ngọc Duy
rm: only refresh entries
t
hat
w
e may
t
o
uch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
David R
i
pton
bisect:
f
ix singul
a
r/plural grammar nit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walt
o
n
cvsimport: standariz
e
system() calls t
o
ex
t
ernal g
i
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ben
W
alton
cvsimpor
t
: standa
r
ize open(
)
calls t
o
e
x
ternal git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ben
W
alton
c
v
simport: modernize
callouts to git s
u
bcommands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch '
m
a
int-1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Merge branch 'maint-1
.
6
.
3
' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Merge b
r
anch 'main
t
-1
.
6
.
2' into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge commit 'v1
.
6
.
4
.
4
-8-g8de6518'
i
nto m
a
int-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Fix mis-backport of t
7
002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Up
d
at
e
draft release no
t
es to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
i
o C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Update draft releas
e
n
o
tes 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/m
a
i
n
t-
1
.
6
.
5-fast-impo
r
t
-non-commi
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Merge branc
h
'
jc/
r
erere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branc
h
'
p
c
/
un
i
nteresting-submodule-disa
p
pear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C H
a
mano
Merge
b
ranch
'
nd
/
i
nclude-termio
s
-f
o
r-o
s
o
l
'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Merge branc
h
'
j
s/windows'
commit
|
commitdiff
|
tree
2010-01-19
A
n
dreas Gruenbache
r
bui
l
tin-apply
.
c:
f
i
x the --- and +++ header filename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Daniel Barka
l
o
w
Replac
e
p
arse_blob() with an explanatory comment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
M
e
rge
branch
'jm/maint
-
1
.
6
.
5-gre
p
-NUL
-
t
e
rminate
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jim M
e
yerin
g
g
re
p
: NUL terminate input f
r
om
a fi
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Andreas Gruenbacher
bu
i
ltin-apply
.
c: Skip filenames wi
t
hout enou
g
h
c
omponent
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
s
y
m
links
.
c: remove unused f
u
nctions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Hamano
obj
e
c
t
.
c: remove unus
e
d functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C
Hamano
Doc
u
ment that merge strategie
s
c
an now take their ow
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
E
x
t
end merge-subt
r
ee tests to
test -Xsubtree=dir
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C H
a
ma
n
o
Make "subtree" part m
o
re orthogonal
t
o
the re
s
t
of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Haman
o
pull: Fix parsi
n
g of
-
X<opti
o
n>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
Teach git-pu
l
l to
p
a
s
s
-
X<opt
i
on>
to
git
-
merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
git me
r
ge -X
<
option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C
Hamano
Update draft
release
note
s
to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Hamano
Merge
b
ranch
'
tc/test
-
l
o
cate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C
Hamano
Merg
e
branch 'jh/commit-status'
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C
Ham
a
no
Merge branch 'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge
branc
h
'jc/maint-1
.
6
.
1-check
o
ut-m-
c
ust
o
m-merge'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C
Hamano
Merge b
r
anch 'tc/
c
lone-v-pr
o
gre
s
s'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge bran
c
h
'
t
c/sma
r
t-ht
t
p-restr
i
c
t
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch
'
j
k
/run-c
o
mmand-u
s
e-shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
Mer
g
e bran
c
h
'
sr/gfi-options
'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
Update COPYING with GPL
v
2 wi
t
h
new FSF addr
e
ss
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
us
e
r
_
i
d
ent_
s
ufficiently_gi
v
en(
)
: refactor the logi
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
user_ident_suffic
i
ently_g
i
ve
n
(
)
: refa
c
tor the
l
ogic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o
C Haman
o
r
erere: h
o
nor conflict-
m
a
r
ker
-
size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
rerere: prepare fo
r
custom
i
za
b
le conflict marker len
g
th
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
c
ommit
.
c:
:
pr
i
nt_s
u
m
mary
:
do not release the
f
orma
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
conflict-
m
arker-size: new attr
i
bute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
rerere: use
l
l_merge() instead of using xdl_merg
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
am
a
no
merg
e
-tree: use l
l
_merge(
)
not xdl_mer
g
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
xd
l
_
m
er
g
e(): al
l
ow p
a
s
s
ing down ma
r
ker_siz
e
in xm
p
aram
_
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
x
d
l
_m
e
r
ge(): int
r
oduce xmpa
r
a
m_t for
merge
s
p
ecific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next