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
Merge branch 'jc/checkout-merge-base'
2010-01-21
Junio C Hama
n
o
Merg
e
b
ra
n
ch 'jc/checkout-merge-base'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
no
Me
r
ge
br
a
nch
'
a
g
/pa
t
ch-heade
r
-ve
r
ify
'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
i
o
C Hamano
Merge branch 'jc
/
conflic
t
-marker-size'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C
Ha
m
ano
Merge branch 'ag/maint-apply-too-large-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merg
e
branch
'
ap/merge-b
a
cken
d
-
opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hama
n
o
Merge
branch 'nd/
s
tatus-partia
l
-refr
e
sh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
Merge remote branch 're
m
ot
e
s/trast-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
Merge branch 'jh/notes' (ea
r
ly
p
a
r
t)
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C
H
aman
o
Mer
g
e br
a
nch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Ha
m
ano
Merg
e
branch 'jc/maint-re
f
resh-index-is-op
t
ional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge branch 'rr
/
cor
e
-tutoria
l
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
man
o
Merge
b
ranch 'jc/cache-unm
e
rge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merg
e
branch
'
js/exec-err
o
r-report'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
Haman
o
Merge bran
c
h
'jc/ls-f
i
les-ignore
d
-
pa
t
h
spec
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
M
erge branch 'jc/grep-lookahead
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge bran
c
h 'jc/maint-s
t
rbuf-add-
f
ix-do
u
bling'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ham
a
no
M
e
rg
e
branch 'mm
/
conflict
-
advice'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
H
amano
Merge br
a
nch 'da/diff
t
o
ol'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Ham
a
no
Merge bra
n
ch 'mh/rebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ha
m
an
o
Merge branch
'ns/rebase-auto-squ
a
sh'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
H
ama
n
o
Merge branc
h
'mh/rebase-fixup'
(
ear
l
y part)
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branc
h
'il
/
push-set-ups
t
ream'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
ama
n
o
Merge
b
ranch
'jk/
w
arn-author-committer-after-com
m
it'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge branch 'jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merg
e
branch 'tr/h
t
tp-push-ref-
s
t
a
tus'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge bra
n
ch 'bk/fix-
r
elative-gitdir-f
i
le'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e
branch 'sd/
c
d-p-sh
o
w-t
o
plevel'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge branch 'jc/symbo
l
-
static'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
dat
e
.
c: mark
file-local function
stati
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hama
n
o
Sync with 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C H
a
m
a
no
Git 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge branc
h
'bg
/
maint-remote-upd
a
te
-
defa
u
lt' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bra
n
ch
'
sb/
m
aint-octopus' in
t
o maint
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merg
e
branc
h
'bg/maint-add
-
a
ll-doc'
i
n
to
ma
i
nt
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
a
n
o
Mer
g
e branch 'main
t
-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
n
o
Gi
t
1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ham
a
no
Merge br
a
nch
'
jk/
m
a
i
nt-1
.
6
.
5-re
s
et-
h
a
r
d' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hama
n
o
Merge
b
ra
n
ch 'tr/maint-1
.
6
.
5-ba
s
h-prom
p
t-show-submodul
e
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
H
a
m
ano
Merge branch
'
dp/m
a
int-1
.
6
.
5-fast-im
p
ort-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
am
a
no
Merge branch '
j
m/ma
i
nt-1
.
6
.
5-grep-NUL-terminate'
int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Fix "c
h
e
cko
u
t A
.
.
.
" sy
n
onym for
"c
h
eckout
A
.
.
.
HEAD
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
H
amano
status
:
don't requir
e
the repository
t
o
be w
r
itab
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ham
a
no
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-01-19
Joha
n
ne
s
Sixt
Makefile: honor NO_
C
URL wh
e
n
setting REMOTE_CURL_*
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Tarmigan Cas
e
bolt
ident
.
c:
r
eplace fprintf with fpu
t
s
to s
u
ppress com
p
iler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Nguyễn Thái Ngọc Duy
rm: o
n
ly refresh entries that
we may
touch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
D
avid Ripton
bis
e
ct:
fix singula
r
/plural gra
m
mar ni
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
un
i
o
C Hama
n
o
Merge bra
n
ch 'maint-1
.
6
.
4'
i
nt
o
maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Merge br
a
nch 'maint-1
.
6
.
3
' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hama
n
o
Merge bra
n
ch 'm
a
i
n
t-1
.
6
.
2
' into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hama
n
o
Merge c
o
mm
i
t 'v1
.
6
.
4
.
4-8-g
8
de6518'
int
o
m
a
i
nt-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Fix mis
-
backpo
r
t of t7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Update d
r
aft release notes to
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Mer
g
e br
a
n
c
h 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hama
n
o
Update draft release 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
b
ranch 'd
p
/mai
n
t-1
.
6
.
5
-fast
-
i
mpo
r
t-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
M
e
r
ge bra
n
ch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Merge branch 'pc/un
i
nteresting-submodule-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Ham
a
no
Merge br
a
nch 'nd/
i
nclude-termio
s
-for-os
o
l'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
H
a
man
o
Merge branch 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Andre
a
s Gruen
b
ach
e
r
builtin-apply
.
c
:
fix the -
-
-
a
nd +++
h
eader filename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Daniel Barkalow
Replace parse_
b
lob() with an
e
xplanator
y
comment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Merge
branch 'jm/ma
i
nt-1
.
6
.
5-grep-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jim Meye
r
ing
grep
:
NUL terminat
e
i
nput from a
file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Andreas
G
ruen
b
a
c
her
b
u
ilt
i
n-a
p
ply
.
c: Sk
i
p filenames without enough compon
e
nts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
symlinks
.
c: rem
o
ve unused
f
un
c
ti
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Haman
o
object
.
c
:
r
e
m
ove
u
n
used
f
unctions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C Ha
m
ano
D
ocument t
h
a
t
m
e
r
ge
s
trateg
i
es
can
n
ow take t
h
e
i
r
own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pe
n
narun
Extend merge-subtre
e
te
s
ts to
t
est -
X
subtr
e
e=dir
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Make "subtree
"
p
art mor
e
orthogonal to the r
e
st of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C
Hamano
pull
:
Fix parsing of -
X
<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
Teach
g
it-pull to pass
-X<
o
pti
o
n> to git-merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery Penna
r
un
git merge
-
X<
o
ption>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Hamano
Update
d
r
a
f
t
relea
s
e notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
H
a
mano
Merge
branch 'tc/test
-
l
ocate-httpd
'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge b
r
anch 'jh
/
com
m
it
-
status'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge
branch '
j
n/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Ha
m
ano
Merge br
a
n
ch '
j
c/maint
-
1
.
6
.
1-checkout-m-
c
u
s
tom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
Merge branch 'tc/clone-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge br
a
nch 'tc/s
m
art-http
-
r
estr
i
c
t
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
M
erge
b
ranch 'j
k
/run-
c
ommand-use-shel
l
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
Merge branch 'sr/gfi-
o
pt
i
ons'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
U
pdate COPYING with G
P
Lv2 with new FS
F
addr
e
s
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
user_iden
t
_s
u
fficiently_
g
iven(): refactor the l
o
gic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
user_id
e
nt_suf
f
iciently_given(): refactor the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
re
r
ere: honor conflict-marker-size att
r
ibute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Ha
m
ano
r
erere: prepar
e
for customizable conflic
t
marker length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
commit
.
c::p
r
i
n
t_summar
y
: do not r
e
lease the fo
r
m
a
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
conf
l
ict-marker-siz
e
: ne
w
attribut
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere:
u
se l
l
_merge(
)
inste
a
d of using xdl_me
r
ge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C
Ha
m
ano
mer
g
e-tree: use ll_merge
(
) no
t
x
dl_me
r
ge
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C
Ham
a
no
xd
l
_merge():
a
llow pa
s
sing dow
n
marker_size in xmparam_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge(): introduce xmparam_
t
for merge 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
u
nction signature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Johannes Sixt
Do no
t
use
d
ate
.
c:tm_to_time
_
t
(
) from compat
/
mi
n
gw
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Andr
z
ej K
.
H
a
czewski
MS
V
C: W
i
ndows-
n
a
tive implement
a
t
i
on
for subset
of Pthreads API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merg
e
b
r
anch 'cc/
r
eset-mo
r
e'
commit
|
commitdiff
|
tree
2010-01-17
Ramkumar
R
a
macha
n
dr
a
Documentation: Up
d
ate git core
t
utorial cl
a
rify
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ram
s
ay Jones
MSVC: Fix an
"inc
o
mpatible pointer
types"
c
ompiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next